Skip to content

fixes the string issue #3041

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 26, 2019
Merged

fixes the string issue #3041

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d908f34
fix strings
Jun 26, 2019
e869941
Update activity_achievements.xml
Jun 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/src/main/java/fr/free/nrw/commons/achievements/AchievementsActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ private void inflateAchievements(Achievements achievements) {
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,
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/fr/free/nrw/commons/explore/SearchActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,9 @@ public void setTabs() {
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();
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/fr/free/nrw/commons/explore/categories/ExploreActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,14 +93,14 @@ public void setTabs() {
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();
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/fr/free/nrw/commons/explore/recentsearches/RecentSearchesFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
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);
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/fr/free/nrw/commons/review/ReviewActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ public void onDestroy() {

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),
"",
Expand Down
6 changes: 4 additions & 2 deletions app/src/main/res/layout/activity_achievements.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>

<ImageView
android:id="@+id/achievement_info"
Expand Down Expand Up @@ -280,7 +281,8 @@
style="?android:textAppearanceLarge"
android:layout_marginLeft="@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
android:layout_width="match_parent"
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/res/layout/activity_review.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@
android:drawablePadding="12dp"
android:drawableTint="@color/button_blue_dark"
android:text="@string/skip_image"
android:textColor="@color/button_blue_dark"/>
android:textColor="@color/button_blue_dark"
android:textAllCaps="true"/>

<RelativeLayout
android:layout_width="match_parent"
Expand Down
6 changes: 4 additions & 2 deletions app/src/main/res/layout/bottom_sheet_details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@
android:textColor="@color/text_color_selector"
android:layout_gravity="center_horizontal"
android:text="@string/nearby_directions"
android:textAllCaps="true"
/>
</LinearLayout>
<LinearLayout
Expand Down Expand Up @@ -144,6 +145,7 @@
android:textColor="@color/text_color_selector"
android:layout_gravity="center_horizontal"
android:text="@string/nearby_wikidata"
android:textAllCaps="true"
/>
</LinearLayout>

Expand Down Expand Up @@ -174,7 +176,7 @@
android:textColor="@color/text_color_selector"
android:layout_gravity="center_horizontal"
android:text="@string/nearby_wikipedia"

android:textAllCaps="true"
/>
</LinearLayout>

Expand Down Expand Up @@ -204,7 +206,7 @@
android:textColor="@color/text_color_selector"
android:layout_gravity="center_horizontal"
android:text="@string/nearby_commons"

android:textAllCaps="true"
/>
</LinearLayout>
</LinearLayout>
Expand Down
28 changes: 14 additions & 14 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,18 +279,18 @@
<string name="nearby_location_has_not_changed">Location has not changed.</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="get_directions">GET DIRECTIONS</string>
<string name="read_article">READ ARTICLE</string>
<string name="get_directions">Get directions</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 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_mention">%1$s mentioned you on %2$s.</string>
<string name="toggle_view_button">Toggle view</string>
<string name="nearby_directions">DIRECTIONS</string>
<string name="nearby_wikidata">WIKIDATA</string>
<string name="nearby_wikipedia">WIKIPEDIA</string>
<string name="nearby_commons">COMMONS</string>
<string name="nearby_directions">Directions</string>
<string name="nearby_wikidata">Wikidata</string>
<string name="nearby_wikipedia">Wikipedia</string>
<string name="nearby_commons">Commons</string>
<string name="about_rate_us"><![CDATA[<u>Rate us</u>]]></string>
<string name="about_faq"><![CDATA[<u>FAQ</u>]]></string>
<string name="welcome_skip_button">Skip Tutorial</string>
Expand Down Expand Up @@ -327,10 +327,10 @@
<string name="provider_searches">Recently searched queries</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="search_tab_title_media">MEDIA</string>
<string name="search_tab_title_categories">CATEGORIES</string>
<string name="explore_tab_title_featured">FEATURED</string>
<string name="explore_tab_title_mobile">UPLOADED VIA MOBILE</string>
<string name="search_tab_title_media">Media</string>
<string name="search_tab_title_categories">Categories</string>
<string name="explore_tab_title_featured">Featured</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="wikidata_edit_failure">Failed to update corresponding Wikidata entity!</string>
Expand Down Expand Up @@ -366,14 +366,14 @@
<string name="delete_search_dialog">Do you want to delete this search?</string>
<string name="search_history_deleted">Search history deleted</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="statistics">STATISTICS</string>
<string name="statistics">Statistics</string>
<string name="statistics_thanks">Thanks Received</string>
<string name="statistics_featured">Featured Images</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="image_reverts">Images Not Reverted</string>
<string name="images_used_by_wiki">Images Used</string>
Expand Down Expand Up @@ -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="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="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="manage_exif_tags">Manage EXIF Tags</string>
Expand Down