From 4ec92c2e7b7f70a073134bfdfda5c0ab3d56fe3d Mon Sep 17 00:00:00 2001 From: sherlockbeard <46790654+sherlockbeard@users.noreply.github.com> Date: Wed, 26 Jun 2019 19:36:41 +0530 Subject: [PATCH] fixes the string issue (#3041) * fix strings * Update activity_achievements.xml --- .../achievements/AchievementsActivity.java | 2 +- .../nrw/commons/explore/SearchActivity.java | 4 +-- .../explore/categories/ExploreActivity.java | 4 +-- .../RecentSearchesFragment.java | 2 +- .../nrw/commons/review/ReviewActivity.java | 2 +- .../main/res/layout/activity_achievements.xml | 6 ++-- app/src/main/res/layout/activity_review.xml | 3 +- .../main/res/layout/bottom_sheet_details.xml | 6 ++-- app/src/main/res/values/strings.xml | 28 +++++++++---------- 9 files changed, 31 insertions(+), 26 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/achievements/AchievementsActivity.java b/app/src/main/java/fr/free/nrw/commons/achievements/AchievementsActivity.java index 38198b024..e701d68a7 100644 --- a/app/src/main/java/fr/free/nrw/commons/achievements/AchievementsActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/achievements/AchievementsActivity.java @@ -355,7 +355,7 @@ public class AchievementsActivity extends NavigationBaseActivity { imagesUsedByWikiProgressBar.setProgressTextFormatPattern (achievements.getUniqueUsedImages() + "/" + levelInfo.getMaxUniqueImages()); imagesFeatured.setText(String.valueOf(achievements.getFeaturedImages())); - String levelUpInfoString = getString(R.string.level); + String levelUpInfoString = getString(R.string.level).toUpperCase(); levelUpInfoString += " " + levelInfo.getLevelNumber(); levelNumber.setText(levelUpInfoString); imageView.setImageDrawable(VectorDrawableCompat.create(getResources(), R.drawable.badge, diff --git a/app/src/main/java/fr/free/nrw/commons/explore/SearchActivity.java b/app/src/main/java/fr/free/nrw/commons/explore/SearchActivity.java index 6ca0a13af..2d5dbd331 100644 --- a/app/src/main/java/fr/free/nrw/commons/explore/SearchActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/explore/SearchActivity.java @@ -90,9 +90,9 @@ public class SearchActivity extends NavigationBaseActivity implements MediaDetai searchImageFragment = new SearchImageFragment(); searchCategoryFragment= new SearchCategoryFragment(); fragmentList.add(searchImageFragment); - titleList.add(getResources().getString(R.string.search_tab_title_media)); + titleList.add(getResources().getString(R.string.search_tab_title_media).toUpperCase()); fragmentList.add(searchCategoryFragment); - titleList.add(getResources().getString(R.string.search_tab_title_categories)); + titleList.add(getResources().getString(R.string.search_tab_title_categories).toUpperCase()); viewPagerAdapter.setTabData(fragmentList, titleList); viewPagerAdapter.notifyDataSetChanged(); diff --git a/app/src/main/java/fr/free/nrw/commons/explore/categories/ExploreActivity.java b/app/src/main/java/fr/free/nrw/commons/explore/categories/ExploreActivity.java index 1fa403a6a..1bc88c5a8 100644 --- a/app/src/main/java/fr/free/nrw/commons/explore/categories/ExploreActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/explore/categories/ExploreActivity.java @@ -93,14 +93,14 @@ public class ExploreActivity featuredArguments.putString("categoryName", FEATURED_IMAGES_CATEGORY); featuredImagesListFragment.setArguments(featuredArguments); fragmentList.add(featuredImagesListFragment); - titleList.add(getString(R.string.explore_tab_title_featured)); + titleList.add(getString(R.string.explore_tab_title_featured).toUpperCase()); mobileImagesListFragment = new CategoryImagesListFragment(); Bundle mobileArguments = new Bundle(); mobileArguments.putString("categoryName", MOBILE_UPLOADS_CATEGORY); mobileImagesListFragment.setArguments(mobileArguments); fragmentList.add(mobileImagesListFragment); - titleList.add(getString(R.string.explore_tab_title_mobile)); + titleList.add(getString(R.string.explore_tab_title_mobile).toUpperCase()); viewPagerAdapter.setTabData(fragmentList, titleList); viewPagerAdapter.notifyDataSetChanged(); diff --git a/app/src/main/java/fr/free/nrw/commons/explore/recentsearches/RecentSearchesFragment.java b/app/src/main/java/fr/free/nrw/commons/explore/recentsearches/RecentSearchesFragment.java index a42299dda..823930add 100644 --- a/app/src/main/java/fr/free/nrw/commons/explore/recentsearches/RecentSearchesFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/explore/recentsearches/RecentSearchesFragment.java @@ -74,7 +74,7 @@ public class RecentSearchesFragment extends CommonsDaggerSupportFragment { recentSearchesList.setOnItemLongClickListener((parent, view, position, id) -> { new AlertDialog.Builder(getContext()) .setMessage(R.string.delete_search_dialog) - .setPositiveButton(R.string.delete,((dialog, which) -> { + .setPositiveButton(getString(R.string.delete).toUpperCase(),((dialog, which) -> { recentSearchesDao.delete(recentSearchesDao.find(recentSearches.get(position))); recentSearches = recentSearchesDao.recentSearches(10); adapter = new ArrayAdapter<>(getContext(), R.layout.item_recent_searches, recentSearches); diff --git a/app/src/main/java/fr/free/nrw/commons/review/ReviewActivity.java b/app/src/main/java/fr/free/nrw/commons/review/ReviewActivity.java index cbb9848ca..7437e63bb 100644 --- a/app/src/main/java/fr/free/nrw/commons/review/ReviewActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/review/ReviewActivity.java @@ -199,7 +199,7 @@ public class ReviewActivity extends AuthenticatedActivity { public void showSkipImageInfo(){ DialogUtil.showAlertDialog(ReviewActivity.this, - getString(R.string.skip_image), + getString(R.string.skip_image).toUpperCase(), getString(R.string.skip_image_explanation), getString(android.R.string.ok), "", diff --git a/app/src/main/res/layout/activity_achievements.xml b/app/src/main/res/layout/activity_achievements.xml index 2b709e4aa..b81831e96 100644 --- a/app/src/main/res/layout/activity_achievements.xml +++ b/app/src/main/res/layout/activity_achievements.xml @@ -43,7 +43,8 @@ android:layout_marginStart="@dimen/activity_margin_horizontal" android:layout_marginTop="@dimen/activity_margin_horizontal" android:text="@string/level" - android:id="@+id/achievement_level" /> + android:id="@+id/achievement_level" + android:textAllCaps="true"/> + android:layout_marginTop="@dimen/activity_margin_vertical" + android:textAllCaps="true"/> + android:textColor="@color/button_blue_dark" + android:textAllCaps="true"/> @@ -174,7 +176,7 @@ android:textColor="@color/text_color_selector" android:layout_gravity="center_horizontal" android:text="@string/nearby_wikipedia" - + android:textAllCaps="true" /> @@ -204,7 +206,7 @@ android:textColor="@color/text_color_selector" android:layout_gravity="center_horizontal" android:text="@string/nearby_commons" - + android:textAllCaps="true" /> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ac9d2e736..5e5960be2 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -279,18 +279,18 @@ Location has not changed. Location not available. Permission required to display a list of nearby places - GET DIRECTIONS - READ ARTICLE + Get directions + Read article Welcome to Wikimedia Commons, %1$s! We\'re glad you\'re here. %1$s left a message on your talk page Thank you for making an edit %1$s mentioned you on %2$s. Toggle view - DIRECTIONS - WIKIDATA - WIKIPEDIA - COMMONS + Directions + Wikidata + Wikipedia + Commons Rate us]]> FAQ]]> Skip Tutorial @@ -327,10 +327,10 @@ Recently searched queries Error occurred while loading categories. Error occurred while loading subcategories. - MEDIA - CATEGORIES - FEATURED - UPLOADED VIA MOBILE + Media + Categories + Featured + Uploaded via mobile Image successfully added to %1$s on Wikidata! Failed to update corresponding Wikidata entity! @@ -366,14 +366,14 @@ Do you want to delete this search? Search history deleted Nominate For Deletion - DELETE + Delete Achievements - STATISTICS + Statistics Thanks Received Featured Images Images via \"Nearby Places\" - LEVEL + Level Images Uploaded Images Not Reverted Images Used @@ -537,7 +537,7 @@ Upload your first media by tapping on the add button. Click to reuse the title and description you entered in your previous picture and modify it to fit your current one Examples of good images to upload to Commons Examples of images not to upload - SKIP THIS IMAGE + Skip this image Download Failed!!. We cannot download the file without external storage permission. Manage EXIF Tags