fixes the string issue (#3041)

* fix strings

* Update activity_achievements.xml
This commit is contained in:
sherlockbeard 2019-06-26 19:36:41 +05:30 committed by neslihanturan
parent 17eb6f43ed
commit 4ec92c2e7b
9 changed files with 31 additions and 26 deletions

View file

@ -355,7 +355,7 @@ public class AchievementsActivity extends NavigationBaseActivity {
imagesUsedByWikiProgressBar.setProgressTextFormatPattern imagesUsedByWikiProgressBar.setProgressTextFormatPattern
(achievements.getUniqueUsedImages() + "/" + levelInfo.getMaxUniqueImages()); (achievements.getUniqueUsedImages() + "/" + levelInfo.getMaxUniqueImages());
imagesFeatured.setText(String.valueOf(achievements.getFeaturedImages())); imagesFeatured.setText(String.valueOf(achievements.getFeaturedImages()));
String levelUpInfoString = getString(R.string.level); String levelUpInfoString = getString(R.string.level).toUpperCase();
levelUpInfoString += " " + levelInfo.getLevelNumber(); levelUpInfoString += " " + levelInfo.getLevelNumber();
levelNumber.setText(levelUpInfoString); levelNumber.setText(levelUpInfoString);
imageView.setImageDrawable(VectorDrawableCompat.create(getResources(), R.drawable.badge, imageView.setImageDrawable(VectorDrawableCompat.create(getResources(), R.drawable.badge,

View file

@ -90,9 +90,9 @@ public class SearchActivity extends NavigationBaseActivity implements MediaDetai
searchImageFragment = new SearchImageFragment(); searchImageFragment = new SearchImageFragment();
searchCategoryFragment= new SearchCategoryFragment(); searchCategoryFragment= new SearchCategoryFragment();
fragmentList.add(searchImageFragment); 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); 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.setTabData(fragmentList, titleList);
viewPagerAdapter.notifyDataSetChanged(); viewPagerAdapter.notifyDataSetChanged();

View file

@ -93,14 +93,14 @@ public class ExploreActivity
featuredArguments.putString("categoryName", FEATURED_IMAGES_CATEGORY); featuredArguments.putString("categoryName", FEATURED_IMAGES_CATEGORY);
featuredImagesListFragment.setArguments(featuredArguments); featuredImagesListFragment.setArguments(featuredArguments);
fragmentList.add(featuredImagesListFragment); 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(); mobileImagesListFragment = new CategoryImagesListFragment();
Bundle mobileArguments = new Bundle(); Bundle mobileArguments = new Bundle();
mobileArguments.putString("categoryName", MOBILE_UPLOADS_CATEGORY); mobileArguments.putString("categoryName", MOBILE_UPLOADS_CATEGORY);
mobileImagesListFragment.setArguments(mobileArguments); mobileImagesListFragment.setArguments(mobileArguments);
fragmentList.add(mobileImagesListFragment); 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.setTabData(fragmentList, titleList);
viewPagerAdapter.notifyDataSetChanged(); viewPagerAdapter.notifyDataSetChanged();

View file

@ -74,7 +74,7 @@ public class RecentSearchesFragment extends CommonsDaggerSupportFragment {
recentSearchesList.setOnItemLongClickListener((parent, view, position, id) -> { recentSearchesList.setOnItemLongClickListener((parent, view, position, id) -> {
new AlertDialog.Builder(getContext()) new AlertDialog.Builder(getContext())
.setMessage(R.string.delete_search_dialog) .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))); recentSearchesDao.delete(recentSearchesDao.find(recentSearches.get(position)));
recentSearches = recentSearchesDao.recentSearches(10); recentSearches = recentSearchesDao.recentSearches(10);
adapter = new ArrayAdapter<>(getContext(), R.layout.item_recent_searches, recentSearches); adapter = new ArrayAdapter<>(getContext(), R.layout.item_recent_searches, recentSearches);

View file

@ -199,7 +199,7 @@ public class ReviewActivity extends AuthenticatedActivity {
public void showSkipImageInfo(){ public void showSkipImageInfo(){
DialogUtil.showAlertDialog(ReviewActivity.this, DialogUtil.showAlertDialog(ReviewActivity.this,
getString(R.string.skip_image), getString(R.string.skip_image).toUpperCase(),
getString(R.string.skip_image_explanation), getString(R.string.skip_image_explanation),
getString(android.R.string.ok), getString(android.R.string.ok),
"", "",

View file

@ -43,7 +43,8 @@
android:layout_marginStart="@dimen/activity_margin_horizontal" android:layout_marginStart="@dimen/activity_margin_horizontal"
android:layout_marginTop="@dimen/activity_margin_horizontal" android:layout_marginTop="@dimen/activity_margin_horizontal"
android:text="@string/level" android:text="@string/level"
android:id="@+id/achievement_level" /> android:id="@+id/achievement_level"
android:textAllCaps="true"/>
<ImageView <ImageView
android:id="@+id/achievement_info" android:id="@+id/achievement_info"
@ -280,7 +281,8 @@
style="?android:textAppearanceLarge" style="?android:textAppearanceLarge"
android:layout_marginLeft="@dimen/activity_margin_horizontal" android:layout_marginLeft="@dimen/activity_margin_horizontal"
android:layout_marginStart="@dimen/activity_margin_horizontal" android:layout_marginStart="@dimen/activity_margin_horizontal"
android:layout_marginTop="@dimen/activity_margin_vertical" /> android:layout_marginTop="@dimen/activity_margin_vertical"
android:textAllCaps="true"/>
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"

View file

@ -29,7 +29,8 @@
android:drawablePadding="12dp" android:drawablePadding="12dp"
android:drawableTint="@color/button_blue_dark" android:drawableTint="@color/button_blue_dark"
android:text="@string/skip_image" android:text="@string/skip_image"
android:textColor="@color/button_blue_dark"/> android:textColor="@color/button_blue_dark"
android:textAllCaps="true"/>
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"

View file

@ -116,6 +116,7 @@
android:textColor="@color/text_color_selector" android:textColor="@color/text_color_selector"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:text="@string/nearby_directions" android:text="@string/nearby_directions"
android:textAllCaps="true"
/> />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
@ -144,6 +145,7 @@
android:textColor="@color/text_color_selector" android:textColor="@color/text_color_selector"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:text="@string/nearby_wikidata" android:text="@string/nearby_wikidata"
android:textAllCaps="true"
/> />
</LinearLayout> </LinearLayout>
@ -174,7 +176,7 @@
android:textColor="@color/text_color_selector" android:textColor="@color/text_color_selector"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:text="@string/nearby_wikipedia" android:text="@string/nearby_wikipedia"
android:textAllCaps="true"
/> />
</LinearLayout> </LinearLayout>
@ -204,7 +206,7 @@
android:textColor="@color/text_color_selector" android:textColor="@color/text_color_selector"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:text="@string/nearby_commons" android:text="@string/nearby_commons"
android:textAllCaps="true"
/> />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

View file

@ -279,18 +279,18 @@
<string name="nearby_location_has_not_changed">Location has not changed.</string> <string name="nearby_location_has_not_changed">Location has not changed.</string>
<string name="nearby_location_not_available">Location not available.</string> <string name="nearby_location_not_available">Location not available.</string>
<string name="location_permission_rationale_nearby">Permission required to display a list of nearby places</string> <string name="location_permission_rationale_nearby">Permission required to display a list of nearby places</string>
<string name="get_directions">GET DIRECTIONS</string> <string name="get_directions">Get directions</string>
<string name="read_article">READ ARTICLE</string> <string name="read_article">Read article</string>
<string formatted="false" name="notifications_welcome">Welcome to Wikimedia Commons, %1$s! We\'re glad you\'re here.</string> <string formatted="false" name="notifications_welcome">Welcome to Wikimedia Commons, %1$s! We\'re glad you\'re here.</string>
<string name="notifications_talk_page_message">%1$s left a message on your talk page</string> <string name="notifications_talk_page_message">%1$s left a message on your talk page</string>
<string name="notifications_thank_you_edit">Thank you for making an edit</string> <string name="notifications_thank_you_edit">Thank you for making an edit</string>
<string name="notifications_mention">%1$s mentioned you on %2$s.</string> <string name="notifications_mention">%1$s mentioned you on %2$s.</string>
<string name="toggle_view_button">Toggle view</string> <string name="toggle_view_button">Toggle view</string>
<string name="nearby_directions">DIRECTIONS</string> <string name="nearby_directions">Directions</string>
<string name="nearby_wikidata">WIKIDATA</string> <string name="nearby_wikidata">Wikidata</string>
<string name="nearby_wikipedia">WIKIPEDIA</string> <string name="nearby_wikipedia">Wikipedia</string>
<string name="nearby_commons">COMMONS</string> <string name="nearby_commons">Commons</string>
<string name="about_rate_us"><![CDATA[<u>Rate us</u>]]></string> <string name="about_rate_us"><![CDATA[<u>Rate us</u>]]></string>
<string name="about_faq"><![CDATA[<u>FAQ</u>]]></string> <string name="about_faq"><![CDATA[<u>FAQ</u>]]></string>
<string name="welcome_skip_button">Skip Tutorial</string> <string name="welcome_skip_button">Skip Tutorial</string>
@ -327,10 +327,10 @@
<string name="provider_searches">Recently searched queries</string> <string name="provider_searches">Recently searched queries</string>
<string name="error_loading_categories">Error occurred while loading categories.</string> <string name="error_loading_categories">Error occurred while loading categories.</string>
<string name="error_loading_subcategories">Error occurred while loading subcategories.</string> <string name="error_loading_subcategories">Error occurred while loading subcategories.</string>
<string name="search_tab_title_media">MEDIA</string> <string name="search_tab_title_media">Media</string>
<string name="search_tab_title_categories">CATEGORIES</string> <string name="search_tab_title_categories">Categories</string>
<string name="explore_tab_title_featured">FEATURED</string> <string name="explore_tab_title_featured">Featured</string>
<string name="explore_tab_title_mobile">UPLOADED VIA MOBILE</string> <string name="explore_tab_title_mobile">Uploaded via mobile</string>
<string name="successful_wikidata_edit">Image successfully added to %1$s on Wikidata!</string> <string name="successful_wikidata_edit">Image successfully added to %1$s on Wikidata!</string>
<string name="wikidata_edit_failure">Failed to update corresponding Wikidata entity!</string> <string name="wikidata_edit_failure">Failed to update corresponding Wikidata entity!</string>
@ -366,14 +366,14 @@
<string name="delete_search_dialog">Do you want to delete this search?</string> <string name="delete_search_dialog">Do you want to delete this search?</string>
<string name="search_history_deleted">Search history deleted</string> <string name="search_history_deleted">Search history deleted</string>
<string name="nominate_delete">Nominate For Deletion</string> <string name="nominate_delete">Nominate For Deletion</string>
<string name="delete">DELETE</string> <string name="delete">Delete</string>
<string name="Achievements">Achievements</string> <string name="Achievements">Achievements</string>
<string name="statistics">STATISTICS</string> <string name="statistics">Statistics</string>
<string name="statistics_thanks">Thanks Received</string> <string name="statistics_thanks">Thanks Received</string>
<string name="statistics_featured">Featured Images</string> <string name="statistics_featured">Featured Images</string>
<string name="statistics_wikidata_edits">Images via \"Nearby Places\"</string> <string name="statistics_wikidata_edits">Images via \"Nearby Places\"</string>
<string name="level">LEVEL</string> <string name="level">Level</string>
<string name="images_uploaded">Images Uploaded</string> <string name="images_uploaded">Images Uploaded</string>
<string name="image_reverts">Images Not Reverted</string> <string name="image_reverts">Images Not Reverted</string>
<string name="images_used_by_wiki">Images Used</string> <string name="images_used_by_wiki">Images Used</string>
@ -537,7 +537,7 @@ Upload your first media by tapping on the add button.</string>
<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> <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>
<string name="welcome_do_upload_content_description">Examples of good images to upload to Commons</string> <string name="welcome_do_upload_content_description">Examples of good images to upload to Commons</string>
<string name="welcome_dont_upload_content_description">Examples of images not to upload</string> <string name="welcome_dont_upload_content_description">Examples of images not to upload</string>
<string name="skip_image">SKIP THIS IMAGE</string> <string name="skip_image">Skip this image</string>
<string name="download_failed_we_cannot_download_the_file_without_storage_permission">Download Failed!!. We cannot download the file without external storage permission.</string> <string name="download_failed_we_cannot_download_the_file_without_storage_permission">Download Failed!!. We cannot download the file without external storage permission.</string>
<string name="manage_exif_tags">Manage EXIF Tags</string> <string name="manage_exif_tags">Manage EXIF Tags</string>