Skip to content

Commit 4ec92c2

Browse files
sherlockbeardneslihanturan
authored andcommitted
fixes the string issue (commons-app#3041)
* fix strings * Update activity_achievements.xml
1 parent 17eb6f4 commit 4ec92c2

File tree

9 files changed

+31
-26
lines changed

9 files changed

+31
-26
lines changed

app/src/main/java/fr/free/nrw/commons/achievements/AchievementsActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ private void inflateAchievements(Achievements achievements) {
355355
imagesUsedByWikiProgressBar.setProgressTextFormatPattern
356356
(achievements.getUniqueUsedImages() + "/" + levelInfo.getMaxUniqueImages());
357357
imagesFeatured.setText(String.valueOf(achievements.getFeaturedImages()));
358-
String levelUpInfoString = getString(R.string.level);
358+
String levelUpInfoString = getString(R.string.level).toUpperCase();
359359
levelUpInfoString += " " + levelInfo.getLevelNumber();
360360
levelNumber.setText(levelUpInfoString);
361361
imageView.setImageDrawable(VectorDrawableCompat.create(getResources(), R.drawable.badge,

app/src/main/java/fr/free/nrw/commons/explore/SearchActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,9 @@ public void setTabs() {
9090
searchImageFragment = new SearchImageFragment();
9191
searchCategoryFragment= new SearchCategoryFragment();
9292
fragmentList.add(searchImageFragment);
93-
titleList.add(getResources().getString(R.string.search_tab_title_media));
93+
titleList.add(getResources().getString(R.string.search_tab_title_media).toUpperCase());
9494
fragmentList.add(searchCategoryFragment);
95-
titleList.add(getResources().getString(R.string.search_tab_title_categories));
95+
titleList.add(getResources().getString(R.string.search_tab_title_categories).toUpperCase());
9696

9797
viewPagerAdapter.setTabData(fragmentList, titleList);
9898
viewPagerAdapter.notifyDataSetChanged();

app/src/main/java/fr/free/nrw/commons/explore/categories/ExploreActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,14 +93,14 @@ public void setTabs() {
9393
featuredArguments.putString("categoryName", FEATURED_IMAGES_CATEGORY);
9494
featuredImagesListFragment.setArguments(featuredArguments);
9595
fragmentList.add(featuredImagesListFragment);
96-
titleList.add(getString(R.string.explore_tab_title_featured));
96+
titleList.add(getString(R.string.explore_tab_title_featured).toUpperCase());
9797

9898
mobileImagesListFragment = new CategoryImagesListFragment();
9999
Bundle mobileArguments = new Bundle();
100100
mobileArguments.putString("categoryName", MOBILE_UPLOADS_CATEGORY);
101101
mobileImagesListFragment.setArguments(mobileArguments);
102102
fragmentList.add(mobileImagesListFragment);
103-
titleList.add(getString(R.string.explore_tab_title_mobile));
103+
titleList.add(getString(R.string.explore_tab_title_mobile).toUpperCase());
104104

105105
viewPagerAdapter.setTabData(fragmentList, titleList);
106106
viewPagerAdapter.notifyDataSetChanged();

app/src/main/java/fr/free/nrw/commons/explore/recentsearches/RecentSearchesFragment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
7474
recentSearchesList.setOnItemLongClickListener((parent, view, position, id) -> {
7575
new AlertDialog.Builder(getContext())
7676
.setMessage(R.string.delete_search_dialog)
77-
.setPositiveButton(R.string.delete,((dialog, which) -> {
77+
.setPositiveButton(getString(R.string.delete).toUpperCase(),((dialog, which) -> {
7878
recentSearchesDao.delete(recentSearchesDao.find(recentSearches.get(position)));
7979
recentSearches = recentSearchesDao.recentSearches(10);
8080
adapter = new ArrayAdapter<>(getContext(), R.layout.item_recent_searches, recentSearches);

app/src/main/java/fr/free/nrw/commons/review/ReviewActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ public void onDestroy() {
199199

200200
public void showSkipImageInfo(){
201201
DialogUtil.showAlertDialog(ReviewActivity.this,
202-
getString(R.string.skip_image),
202+
getString(R.string.skip_image).toUpperCase(),
203203
getString(R.string.skip_image_explanation),
204204
getString(android.R.string.ok),
205205
"",

app/src/main/res/layout/activity_achievements.xml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@
4343
android:layout_marginStart="@dimen/activity_margin_horizontal"
4444
android:layout_marginTop="@dimen/activity_margin_horizontal"
4545
android:text="@string/level"
46-
android:id="@+id/achievement_level" />
46+
android:id="@+id/achievement_level"
47+
android:textAllCaps="true"/>
4748

4849
<ImageView
4950
android:id="@+id/achievement_info"
@@ -280,7 +281,8 @@
280281
style="?android:textAppearanceLarge"
281282
android:layout_marginLeft="@dimen/activity_margin_horizontal"
282283
android:layout_marginStart="@dimen/activity_margin_horizontal"
283-
android:layout_marginTop="@dimen/activity_margin_vertical" />
284+
android:layout_marginTop="@dimen/activity_margin_vertical"
285+
android:textAllCaps="true"/>
284286

285287
<RelativeLayout
286288
android:layout_width="match_parent"

app/src/main/res/layout/activity_review.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@
2929
android:drawablePadding="12dp"
3030
android:drawableTint="@color/button_blue_dark"
3131
android:text="@string/skip_image"
32-
android:textColor="@color/button_blue_dark"/>
32+
android:textColor="@color/button_blue_dark"
33+
android:textAllCaps="true"/>
3334

3435
<RelativeLayout
3536
android:layout_width="match_parent"

app/src/main/res/layout/bottom_sheet_details.xml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@
116116
android:textColor="@color/text_color_selector"
117117
android:layout_gravity="center_horizontal"
118118
android:text="@string/nearby_directions"
119+
android:textAllCaps="true"
119120
/>
120121
</LinearLayout>
121122
<LinearLayout
@@ -144,6 +145,7 @@
144145
android:textColor="@color/text_color_selector"
145146
android:layout_gravity="center_horizontal"
146147
android:text="@string/nearby_wikidata"
148+
android:textAllCaps="true"
147149
/>
148150
</LinearLayout>
149151

@@ -174,7 +176,7 @@
174176
android:textColor="@color/text_color_selector"
175177
android:layout_gravity="center_horizontal"
176178
android:text="@string/nearby_wikipedia"
177-
179+
android:textAllCaps="true"
178180
/>
179181
</LinearLayout>
180182

@@ -204,7 +206,7 @@
204206
android:textColor="@color/text_color_selector"
205207
android:layout_gravity="center_horizontal"
206208
android:text="@string/nearby_commons"
207-
209+
android:textAllCaps="true"
208210
/>
209211
</LinearLayout>
210212
</LinearLayout>

app/src/main/res/values/strings.xml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -279,18 +279,18 @@
279279
<string name="nearby_location_has_not_changed">Location has not changed.</string>
280280
<string name="nearby_location_not_available">Location not available.</string>
281281
<string name="location_permission_rationale_nearby">Permission required to display a list of nearby places</string>
282-
<string name="get_directions">GET DIRECTIONS</string>
283-
<string name="read_article">READ ARTICLE</string>
282+
<string name="get_directions">Get directions</string>
283+
<string name="read_article">Read article</string>
284284

285285
<string formatted="false" name="notifications_welcome">Welcome to Wikimedia Commons, %1$s! We\'re glad you\'re here.</string>
286286
<string name="notifications_talk_page_message">%1$s left a message on your talk page</string>
287287
<string name="notifications_thank_you_edit">Thank you for making an edit</string>
288288
<string name="notifications_mention">%1$s mentioned you on %2$s.</string>
289289
<string name="toggle_view_button">Toggle view</string>
290-
<string name="nearby_directions">DIRECTIONS</string>
291-
<string name="nearby_wikidata">WIKIDATA</string>
292-
<string name="nearby_wikipedia">WIKIPEDIA</string>
293-
<string name="nearby_commons">COMMONS</string>
290+
<string name="nearby_directions">Directions</string>
291+
<string name="nearby_wikidata">Wikidata</string>
292+
<string name="nearby_wikipedia">Wikipedia</string>
293+
<string name="nearby_commons">Commons</string>
294294
<string name="about_rate_us"><![CDATA[<u>Rate us</u>]]></string>
295295
<string name="about_faq"><![CDATA[<u>FAQ</u>]]></string>
296296
<string name="welcome_skip_button">Skip Tutorial</string>
@@ -327,10 +327,10 @@
327327
<string name="provider_searches">Recently searched queries</string>
328328
<string name="error_loading_categories">Error occurred while loading categories.</string>
329329
<string name="error_loading_subcategories">Error occurred while loading subcategories.</string>
330-
<string name="search_tab_title_media">MEDIA</string>
331-
<string name="search_tab_title_categories">CATEGORIES</string>
332-
<string name="explore_tab_title_featured">FEATURED</string>
333-
<string name="explore_tab_title_mobile">UPLOADED VIA MOBILE</string>
330+
<string name="search_tab_title_media">Media</string>
331+
<string name="search_tab_title_categories">Categories</string>
332+
<string name="explore_tab_title_featured">Featured</string>
333+
<string name="explore_tab_title_mobile">Uploaded via mobile</string>
334334

335335
<string name="successful_wikidata_edit">Image successfully added to %1$s on Wikidata!</string>
336336
<string name="wikidata_edit_failure">Failed to update corresponding Wikidata entity!</string>
@@ -366,14 +366,14 @@
366366
<string name="delete_search_dialog">Do you want to delete this search?</string>
367367
<string name="search_history_deleted">Search history deleted</string>
368368
<string name="nominate_delete">Nominate For Deletion</string>
369-
<string name="delete">DELETE</string>
369+
<string name="delete">Delete</string>
370370

371371
<string name="Achievements">Achievements</string>
372-
<string name="statistics">STATISTICS</string>
372+
<string name="statistics">Statistics</string>
373373
<string name="statistics_thanks">Thanks Received</string>
374374
<string name="statistics_featured">Featured Images</string>
375375
<string name="statistics_wikidata_edits">Images via \"Nearby Places\"</string>
376-
<string name="level">LEVEL</string>
376+
<string name="level">Level</string>
377377
<string name="images_uploaded">Images Uploaded</string>
378378
<string name="image_reverts">Images Not Reverted</string>
379379
<string name="images_used_by_wiki">Images Used</string>
@@ -537,7 +537,7 @@ Upload your first media by tapping on the add button.</string>
537537
<string name="previous_button_tooltip_message">Click to reuse the title and description you entered in your previous picture and modify it to fit your current one</string>
538538
<string name="welcome_do_upload_content_description">Examples of good images to upload to Commons</string>
539539
<string name="welcome_dont_upload_content_description">Examples of images not to upload</string>
540-
<string name="skip_image">SKIP THIS IMAGE</string>
540+
<string name="skip_image">Skip this image</string>
541541
<string name="download_failed_we_cannot_download_the_file_without_storage_permission">Download Failed!!. We cannot download the file without external storage permission.</string>
542542

543543
<string name="manage_exif_tags">Manage EXIF Tags</string>

0 commit comments

Comments
 (0)