Merge pull request #964 from gokberksahin/master

Fixed issue #963
This commit is contained in:
Nicolas Raoul 2017-12-13 11:24:42 +09:00 committed by GitHub
commit 3f9177662c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 12 deletions

View file

@ -93,13 +93,6 @@ public class CategorizationFragment extends DaggerFragment {
categoriesList.setLayoutManager(new LinearLayoutManager(getContext())); categoriesList.setLayoutManager(new LinearLayoutManager(getContext()));
RxView.clicks(categoriesSkip)
.takeUntil(RxView.detaches(categoriesSkip))
.subscribe(o -> {
getActivity().onBackPressed();
getActivity().finish();
});
ArrayList<CategoryItem> items = new ArrayList<>(); ArrayList<CategoryItem> items = new ArrayList<>();
categoriesCache = new HashMap<>(); categoriesCache = new HashMap<>();
if (savedInstanceState != null) { if (savedInstanceState != null) {

View file

@ -63,7 +63,7 @@
<item quantity="other">%d yükleme</item> <item quantity="other">%d yükleme</item>
</plurals> </plurals>
<string name="categories_not_found">%1$s ile eşleşen bir kategori bulunamadı</string> <string name="categories_not_found">%1$s ile eşleşen bir kategori bulunamadı</string>
<string name="categories_skip_explanation">Resimlerinizi Wikimedia Commons\'ta daha bulunabilir duruma getirmek için kategoriler ekleyin.\n\nKategori eklemek için yazmaya başlayın.\nBu adımı atlamak için bu iletiye dokunun ya da geri tıklayın.</string> <string name="categories_skip_explanation">Resimlerinizi Wikimedia Commons\'ta daha bulunabilir duruma getirmek için kategoriler ekleyin.\n\nKategori eklemek için yazmaya başlayın.</string>
<string name="categories_activity_title">Kategoriler</string> <string name="categories_activity_title">Kategoriler</string>
<string name="title_activity_settings">Ayarlar</string> <string name="title_activity_settings">Ayarlar</string>
<string name="menu_about">Hakkında</string> <string name="menu_about">Hakkında</string>

View file

@ -69,10 +69,9 @@
<item quantity="other">%d uploads</item> <item quantity="other">%d uploads</item>
</plurals> </plurals>
<string name="categories_not_found">No categories matching %1$s found</string> <string name="categories_not_found">No categories matching %1$s found</string>
<string name="categories_skip_explanation">Add categories to make your images more discoverable on Wikimedia Commons. - <string name="categories_skip_explanation">Add categories to make your images more discoverable on Wikimedia Commons.
-
Start typing to add categories. -Start typing to add categories.</string>
Tap this message (or hit back) to skip this step.</string>
<string name="categories_activity_title">Categories</string> <string name="categories_activity_title">Categories</string>
<string name="title_activity_settings">Settings</string> <string name="title_activity_settings">Settings</string>
<string name="title_activity_signup">Sign Up</string> <string name="title_activity_signup">Sign Up</string>