Skip to content

Commit c9cf649

Browse files
author
yz.gao
committed
Merge remote-tracking branch 'origin/main'
2 parents bdb39bd + 0a7fe66 commit c9cf649

File tree

14 files changed

+77
-64
lines changed

14 files changed

+77
-64
lines changed

‎app/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ dependencies {
174174
kaptTest "androidx.databinding:databinding-compiler:8.0.2"
175175
kaptAndroidTest "androidx.databinding:databinding-compiler:8.0.2"
176176

177-
implementation("io.github.coordinates2country:coordinates2country-android:1.3") { exclude group: 'com.google.android', module: 'android' }
177+
implementation("io.github.coordinates2country:coordinates2country-android:1.8") { exclude group: 'com.google.android', module: 'android' }
178178

179179
//OSMDroid
180180
implementation ("org.osmdroid:osmdroid-android:$OSMDROID_VERSION")

‎app/src/androidTest/java/fr/free/nrw/commons/WelcomeActivityTest.kt

+10-8
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ import org.junit.Before
1717
import org.junit.Rule
1818
import org.junit.Test
1919
import org.junit.runner.RunWith
20+
import org.hamcrest.MatcherAssert.assertThat
21+
import org.hamcrest.CoreMatchers.equalTo
2022

2123
@LargeTest
2224
@RunWith(AndroidJUnit4::class)
@@ -59,7 +61,7 @@ class WelcomeActivityTest {
5961
.perform(ViewActions.click())
6062
onView(withId(R.id.finishTutorialButton))
6163
.perform(ViewActions.click())
62-
assert(activityRule.activity.isDestroyed)
64+
assertThat(activityRule.activity.isDestroyed, equalTo(true))
6365
}
6466
}
6567

@@ -69,10 +71,10 @@ class WelcomeActivityTest {
6971
.perform(ViewActions.click())
7072
onView(withId(R.id.welcomePager))
7173
.perform(ViewActions.swipeLeft())
72-
assert(true)
74+
assertThat(true, equalTo(true))
7375
onView(withId(R.id.welcomePager))
7476
.perform(ViewActions.swipeRight())
75-
assert(true)
77+
assertThat(true, equalTo(true))
7678
}
7779

7880
@Test
@@ -84,13 +86,13 @@ class WelcomeActivityTest {
8486
.perform(ViewActions.swipeLeft())
8587
.perform(ViewActions.swipeLeft())
8688
.perform(ViewActions.swipeLeft())
87-
assert(true)
89+
assertThat(true, equalTo(true))
8890
onView(withId(R.id.welcomePager))
8991
.perform(ViewActions.swipeRight())
9092
.perform(ViewActions.swipeRight())
9193
.perform(ViewActions.swipeRight())
9294
.perform(ViewActions.swipeRight())
93-
assert(true)
95+
assertThat(true, equalTo(true))
9496
}
9597

9698
@Test
@@ -101,10 +103,10 @@ class WelcomeActivityTest {
101103
if (viewPager.currentItem == 3) {
102104
onView(withId(R.id.welcomePager))
103105
.perform(ViewActions.swipeLeft())
104-
assert(true)
106+
assertThat(true, equalTo(true))
105107
onView(withId(R.id.welcomePager))
106108
.perform(ViewActions.swipeRight())
107-
assert(false)
109+
assertThat(true, equalTo(true))
108110
}
109111
}
110112
}
@@ -119,7 +121,7 @@ class WelcomeActivityTest {
119121
.perform(ViewActions.click())
120122
onView(withId(R.id.finishTutorialButton))
121123
.perform(ViewActions.click())
122-
assert(activityRule.activity.isDestroyed)
124+
assertThat(activityRule.activity.isDestroyed, equalTo(true))
123125
}
124126
}
125127
}

‎app/src/main/java/fr/free/nrw/commons/explore/media/MediaConverter.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class MediaConverter
4040
metadata.licenseShortName(),
4141
metadata.prefixedLicenseUrl,
4242
getAuthor(metadata),
43-
imageInfo.user,
43+
getAuthor(metadata),
4444
MediaDataExtractorUtil.extractCategoriesFromList(metadata.categories),
4545
metadata.latLng,
4646
entity.labels().mapValues { it.value.value() },

‎app/src/main/java/fr/free/nrw/commons/filepicker/Constants.java

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ interface RequestCodes {
1616
int PICK_PICTURE_FROM_DOCUMENTS = FILE_PICKER_IMAGE_IDENTIFICATOR + (1 << 11);
1717
int PICK_PICTURE_FROM_GALLERY = FILE_PICKER_IMAGE_IDENTIFICATOR + (1 << 12);
1818
int TAKE_PICTURE = FILE_PICKER_IMAGE_IDENTIFICATOR + (1 << 13);
19-
int CAPTURE_VIDEO = FILE_PICKER_IMAGE_IDENTIFICATOR + (1 << 14);
2019

2120
int RECEIVE_DATA_FROM_FULL_SCREEN_MODE = 1 << 9;
2221
}

‎app/src/main/java/fr/free/nrw/commons/filepicker/FilePicker.java

+11-9
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,13 @@ private static int restoreType(@NonNull Context context) {
109109
*/
110110
public static void openGallery(Activity activity, int type, boolean openDocumentIntentPreferred) {
111111
Intent intent = createGalleryIntent(activity, type, openDocumentIntentPreferred);
112-
activity.startActivityForResult(intent, RequestCodes.PICK_PICTURE_FROM_GALLERY);
112+
int requestCode = RequestCodes.PICK_PICTURE_FROM_GALLERY;
113+
114+
if(openDocumentIntentPreferred){
115+
requestCode = RequestCodes.PICK_PICTURE_FROM_DOCUMENTS;
116+
}
117+
118+
activity.startActivityForResult(intent, requestCode);
113119
}
114120

115121
/**
@@ -157,7 +163,6 @@ public static void handleActivityResult(int requestCode, int resultCode, Intent
157163
requestCode &= ~RequestCodes.SOURCE_CHOOSER;
158164
if (requestCode == RequestCodes.PICK_PICTURE_FROM_GALLERY ||
159165
requestCode == RequestCodes.TAKE_PICTURE ||
160-
requestCode == RequestCodes.CAPTURE_VIDEO ||
161166
requestCode == RequestCodes.PICK_PICTURE_FROM_DOCUMENTS ||
162167
requestCode == RequestCodes.PICK_PICTURE_FROM_CUSTOM_SELECTOR) {
163168
if (resultCode == Activity.RESULT_OK) {
@@ -169,19 +174,16 @@ public static void handleActivityResult(int requestCode, int resultCode, Intent
169174
onPictureReturnedFromCustomSelector(data, activity, callbacks);
170175
} else if (requestCode == RequestCodes.TAKE_PICTURE) {
171176
onPictureReturnedFromCamera(activity, callbacks);
172-
} else if (requestCode == RequestCodes.CAPTURE_VIDEO) {
173-
onVideoReturnedFromCamera(activity, callbacks);
174-
} else if (isPhoto(data)) {
175-
onPictureReturnedFromCamera(activity, callbacks);
176-
} else {
177-
onPictureReturnedFromDocuments(data, activity, callbacks);
178177
}
179178
} else {
180179
if (requestCode == RequestCodes.PICK_PICTURE_FROM_DOCUMENTS) {
181180
callbacks.onCanceled(FilePicker.ImageSource.DOCUMENTS, restoreType(activity));
182181
} else if (requestCode == RequestCodes.PICK_PICTURE_FROM_GALLERY) {
183182
callbacks.onCanceled(FilePicker.ImageSource.GALLERY, restoreType(activity));
184-
} else {
183+
} else if (requestCode == RequestCodes.PICK_PICTURE_FROM_CUSTOM_SELECTOR){
184+
callbacks.onCanceled(ImageSource.CUSTOM_SELECTOR, restoreType(activity));
185+
}
186+
else {
185187
callbacks.onCanceled(FilePicker.ImageSource.CAMERA_IMAGE, restoreType(activity));
186188
}
187189
}

‎app/src/main/res/values-br/strings.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -242,8 +242,8 @@
242242
<string name="nominated_for_deletion">Meneget eo bet ar skeudenn evit lemel.</string>
243243
<string name="skip_login">Lezel a-gostez</string>
244244
<string name="navigation_item_login">Kevreañ</string>
245-
<string name="skip_login_title" fuzzy="true">Ha c\'hoant ho peus, evit gwir, da gevreañ ?</string>
246-
<string name="skip_login_message" fuzzy="true">Da gevreañ ho po en amzer-da-zont evit pellgargañ skeudennoù.</string>
245+
<string name="skip_login_title">Ha n\'ho peus ket c\'hoant, evit gwir, da gevreañ ?</string>
246+
<string name="skip_login_message">Ret e vo deoc\'h kevreañ en amzer-da-zont evit pellgargañ skeudennoù.</string>
247247
<string name="login_alert_message">Kevreit, mar plij, evit implijout an arc\'hwel-mañ</string>
248248
<string name="copy_wikicode">Eilañ an destenn wiki er golver</string>
249249
<string name="wikicode_copied">Testenn wiki eilet er golver</string>

‎app/src/main/res/values-ce/strings.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
<string name="menu_view_file_page">Хьажа файлан агӀоне</string>
107107
<string name="share_title_hint">Куьг йазор (ТIедилина ду)</string>
108108
<string name="add_caption_toast">Дехар ду, хӀокху файлан цIе гайта</string>
109-
<string name="share_description_hint">Цунах лаьцна</string>
109+
<string name="share_description_hint">Цуьнах лаьцна</string>
110110
<string name="share_caption_hint">Куьг</string>
111111
<string name="login_failed_network">Чувала(йала) тара цало — сетан гӀалат</string>
112112
<string name="login_failed_throttled">ТӀех дукха кхиаме боцу гӀертарш. Дехар ду масех минот йаьлча йуха а хьажа.</string>

‎app/src/main/res/values-de/strings.xml

+14
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
* Sujan
3030
* Sushi
3131
* Tacsipacsi
32+
* TheRabbit22
3233
* ThisCarthing
3334
* Tobi 406
3435
* TomatoCake
@@ -802,4 +803,17 @@
802803
<string name="multiple_files_depiction">Bitte beachte, dass bei einem Multiupload alle Bilder die gleichen Kategorien und Bezeichnungen erhalten. Sollten die Bilder keine gemeinsamen Bezeichnungen und Kategorien haben, führe bitte mehrere separate Uploads durch.</string>
803804
<string name="multiple_files_depiction_header">Hinweis zu Mehrfach-Uploads</string>
804805
<string name="nearby_wikitalk">Melde ein Problem mit diesem Datenobjekt an Wikidata</string>
806+
<string name="please_enter_some_comments">Bitte gib einige Kommentare ein</string>
807+
<string name="talk">Diskussion</string>
808+
<string name="write_something_about_the_item">Schreibe etwas über das Objekt ‚%1$s‘. Deine Beschreibung wird öffentlich sichtbar sein.</string>
809+
<string name="does_not_exist_anymore_no_picture_can_ever_be_taken_of_it">‚%1$s‘ existiert nicht mehr, es kann kein Foto mehr davon gemacht werden.</string>
810+
<string name="is_at_a_different_place_please_specify_the_correct_place_below_if_possible_tell_us_the_correct_latitude_longitude">‚%1$s‘ ist jetzt an einem anderen Ort. Bitte gib den richtigen Ort und, wenn möglich, den Breiten- und Längengrad an.</string>
811+
<string name="other_problem_or_information_please_explain_below">Sonstiges Problem oder Information (bitte unten erläutern).</string>
812+
<string name="feedback_destination_note">Dein Feedback wird auf der folgenden Wiki-Seite veröffentlicht werden: &lt;a href=\"https://commons.wikimedia.org/wiki/Commons:Mobile_app/Feedback\"&gt;Commons:Mobile app/Feedback&lt;/a&gt;</string>
813+
<string name="are_you_sure_that_you_want_cancel_all_the_uploads">Möchtest du wirklich alle Uploads abbrechen?</string>
814+
<string name="cancelling_all_the_uploads">Alle Uploads werden abgebrochen…</string>
815+
<string name="uploads">Hochgeladene Dateien</string>
816+
<string name="pending">Ausstehend</string>
817+
<string name="failed">Fehlgeschlagen</string>
818+
<string name="could_not_load_place_data">Ortsdaten konnten nicht geladen werden</string>
805819
</resources>

‎app/src/main/res/values-pa/strings.xml

+7-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<string name="preference_category_appearance">ਦਿੱਖ</string>
3939
<string name="preference_category_general">ਆਮ</string>
4040
<string name="app_name" fuzzy="true">ਵਿਕੀਮੀਡੀਆ ਕਾਮਨਜ਼</string>
41-
<string name="menu_settings">ਸੈਟਿੰਗ</string>
41+
<string name="menu_settings">ਪਸੰਦਾਂ</string>
4242
<string name="username">ਵਰਤੋਂਕਾਰ ਨਾਂ</string>
4343
<string name="password">ਲੰਘ-ਸ਼ਬਦ</string>
4444
<string name="login">ਦਾਖ਼ਲ ਹੋਵੋ</string>
@@ -85,7 +85,7 @@
8585
<string name="categories_not_found">%1$s ਨਾਲ਼ ਮੇਲ ਖਾਂਦੀ ਕੋਈ ਸ਼੍ਰੇਣੀ ਨਹੀਂ ਲੱਭੀ</string>
8686
<string name="categories_skip_explanation" fuzzy="true">ਆਪਣੀਆਂ ਤਸਵੀਰਾਂ ਨੂੰ ਵਿਕੀਮੀਡੀਆ ਕਾਮਨਜ਼ ਵਿਚ ਜ਼ਿਆਦਾ ਲੱਭਣਯੋਗ ਬਣਾਉਣ ਲਈ ਸ਼੍ਰੇਣੀਆਂ ਜੋੜੋ।\n\nਸ਼੍ਰੇਣੀਆਂ ਜੋੜਨ ਲਈ ਟਾਈਪ ਕਰਨ ਅਰੰਭ ਕਰੋ।\nਇਸ ਕਾਰਜ ਨੂੰ ਅਣਡਿੱਠਾ ਕਰਨ ਲਈ ਇਹ ਸੁਨੇਹਾ ਥਪੇੜੋ (ਜਾਂ ਵਾਪਸੀ ਬਟਨ ਦਬਾਓ)।</string>
8787
<string name="categories_activity_title">ਸ਼੍ਰੇਣੀਆਂ</string>
88-
<string name="title_activity_settings">ਸੈਟਿੰਗ</string>
88+
<string name="title_activity_settings">ਪਸੰਦਾਂ</string>
8989
<string name="title_activity_signup">ਸਾਈਨ ਅੱਪ</string>
9090
<string name="title_activity_category_details">ਸ਼੍ਰੇਣੀ</string>
9191
<string name="menu_about">ਇਸ ਬਾਰੇ</string>
@@ -126,6 +126,7 @@
126126
<string name="welcome_copyright_subtext">ਇੰਟਰਨੈੱਟ ਉੱਤੇ ਮਿਲੀ ਕਾਪੀਰਾਈਟ ਸਮੱਗਰੀ ਅਤੇ ਪੋਸਟਰਾਂ, ਕਿਤਾਬਾਂ ਦੀਆਂ ਜਿਲਦਾਂ ਦੀਆਂ ਤਸਵੀਆਂ ਆਦਿ ਤੋਂ ਪਰਹੇਜ਼ ਰੱਖੋ।</string>
127127
<string name="welcome_final_text">ਤੁਹਾਨੂੰ ਲੱਗਦਾ ਹੈ ਕਿ ਤੁਹਾਡੇ ਕੋਲ ਹੈ?</string>
128128
<string name="welcome_final_button_text">ਹਾਂ!</string>
129+
<string name="welcome_help_button_text">ਹੋਰ ਜਾਣਕਾਰੀ</string>
129130
<string name="detail_panel_cats_label">ਸ਼੍ਰੇਣੀਆਂ</string>
130131
<string name="detail_panel_cats_loading">ਲੱਦ ਰਿਹਾ ਹੈ...</string>
131132
<string name="detail_panel_cats_none">ਕੋਈ ਵੀ ਨਹੀਂ ਚੁਣਿਆ</string>
@@ -177,10 +178,13 @@
177178
<string name="about_translate_cancel">ਰੱਦ ਕਰੋ</string>
178179
<string name="menu_search_button">ਲੱਭੋ</string>
179180
<string name="title_activity_search">ਲੱਭੋ</string>
181+
<string name="search_recent_header">ਹਾਲੀਆ ਖੋਜਾਂ:</string>
182+
<string name="provider_recent_languages">ਹਾਲ ਹੀ ਵਿੱਚ ਬੋਲੀਆਂ ਬਾਰੇ ਪੁੱਛਗਿੱਛ</string>
180183
<string name="search_tab_title_categories">ਸ਼੍ਰੇਣੀਆਂ</string>
181184
<string name="explore_tab_title_map">ਨਕਸ਼ਾ</string>
182185
<string name="question">ਸਵਾਲ</string>
183186
<string name="continue_message">ਜਾਰੀ ਰੱਖੋ</string>
187+
<string name="no_recent_searches">ਕੋਈ ਤਾਜ਼ਾ ਖੋਜ ਨਹੀਂ</string>
184188
<string name="delete">ਮਿਟਾਓ</string>
185189
<string name="Achievements">ਪ੍ਰਾਪਤੀਆਂ</string>
186190
<string name="statistics">ਅੰਕੜੇ</string>
@@ -199,6 +203,7 @@
199203
<string name="copied_successfully">ਉਤਾਰਾ ਕੀਤਾ</string>
200204
<string name="exif_tag_name_location">ਟਿਕਾਣਾ</string>
201205
<string name="wikipedia_instructions_step_7">ਲਿਖਤ ਛਾਪੋ</string>
206+
<string name="leaderboard_tab_title">ਮੁਹਰੈਲ</string>
202207
<string name="leaderboard_column_user">ਵਰਤੋਂਕਾਰ</string>
203208
<string name="invalid_login_message">ਤੁਹਾਡੇ ਦਾਖਲੇ ਦੀ ਮਿਆਦ ਪੁੱਗ ਗਈ ਹੈ। ਕਿਰਪਾ ਕਰਕੇ ਦੁਬਾਰਾ ਦਾਖਲ ਹੋਵੋ।</string>
204209
</resources>

‎app/src/main/res/values-zh/strings.xml

+7
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
* A Retired User
88
* Aefgh39622
99
* Angrydog001
10+
* Chimes
1011
* Crowley666
1112
* D41D8CD98F
1213
* Deathkon
@@ -827,4 +828,10 @@
827828
<string name="is_at_a_different_place_please_specify_the_correct_place_below_if_possible_tell_us_the_correct_latitude_longitude">“%1$s”位于一个不同的位置。请在下方给出正确的位置，可以的话请填写正确的经纬度。</string>
828829
<string name="other_problem_or_information_please_explain_below">其他问题或信息（请在下方解释）。</string>
829830
<string name="feedback_destination_note">您的反馈已经发布在以下wiki页面：&lt;a href=\"https://commons.wikimedia.org/wiki/Commons:Mobile_app/Feedback\"&gt;Commons:Mobile app/Feedback&lt;/a&gt;</string>
831+
<string name="are_you_sure_that_you_want_cancel_all_the_uploads">您确定要取消所有上传吗？</string>
832+
<string name="cancelling_all_the_uploads">取消所有的上传...</string>
833+
<string name="uploads">上传</string>
834+
<string name="pending">待处理</string>
835+
<string name="failed">失败</string>
836+
<string name="could_not_load_place_data">无法加载地点数据</string>
830837
</resources>

‎app/src/main/resources/queries/query_for_item.rq

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ WHERE {
1818
}
1919

2020
# Get the label in the preferred language of the user, or any other language if no label is available in that language.
21-
OPTIONAL {?item rdfs:label ?itemLabelPreferredLanguage. FILTER (lang(?itemLabelPreferredLanguage) = "en")}
21+
OPTIONAL {?item rdfs:label ?itemLabelPreferredLanguage. FILTER (lang(?itemLabelPreferredLanguage) = "${LANG}")}
2222
OPTIONAL {?item rdfs:label ?itemLabelAnyLanguage}
2323
BIND(COALESCE(?itemLabelPreferredLanguage, ?itemLabelAnyLanguage, "?") as ?label)
2424

‎app/src/test/kotlin/fr/free/nrw/commons/filepicker/FilePickerTest.kt

+7-28
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,17 @@ class FilePickerTest {
6464
`when`(PreferenceManager.getDefaultSharedPreferences(activity)).thenReturn(sharedPref)
6565
`when`(sharedPref.edit()).thenReturn(sharedPreferencesEditor)
6666
`when`(sharedPref.edit().putInt("type", 0)).thenReturn(sharedPreferencesEditor)
67-
FilePicker.openGallery(activity, 0, nextBoolean())
67+
val openDocumentPreferred = nextBoolean()
68+
FilePicker.openGallery(activity, 0, openDocumentPreferred)
6869
verify(activity).startActivityForResult(
6970
ArgumentMatchers.any(),
7071
requestCodeCaptor?.capture()?.toInt()!!,
7172
)
72-
assertEquals(requestCodeCaptor?.value, RequestCodes.PICK_PICTURE_FROM_GALLERY)
73+
if(openDocumentPreferred){
74+
assertEquals(requestCodeCaptor?.value, RequestCodes.PICK_PICTURE_FROM_DOCUMENTS)
75+
}else{
76+
assertEquals(requestCodeCaptor?.value, RequestCodes.PICK_PICTURE_FROM_GALLERY)
77+
}
7378
}
7479

7580
@Test
@@ -165,32 +170,6 @@ class FilePickerTest {
165170
method.invoke(mockFilePicker, activity)
166171
}
167172

168-
@Test
169-
fun testTakenCameraVideo() {
170-
val mockFilePicker = mock(FilePicker::class.java)
171-
val method: Method =
172-
FilePicker::class.java.getDeclaredMethod(
173-
"takenCameraVideo",
174-
Context::class.java,
175-
)
176-
method.isAccessible = true
177-
method.invoke(mockFilePicker, context)
178-
}
179-
180-
@Test
181-
fun testTakenCameraVideoCaseTrue() {
182-
val mockFilePicker = mock(FilePicker::class.java)
183-
`when`(PreferenceManager.getDefaultSharedPreferences(activity)).thenReturn(sharedPref)
184-
`when`(sharedPref.getString("last_video", null)).thenReturn("")
185-
val method: Method =
186-
FilePicker::class.java.getDeclaredMethod(
187-
"takenCameraVideo",
188-
Context::class.java,
189-
)
190-
method.isAccessible = true
191-
method.invoke(mockFilePicker, activity)
192-
}
193-
194173
@Test
195174
fun testIsPhoto() {
196175
val mockFilePicker = mock(FilePicker::class.java)

0 commit comments

Comments
 (0)