Skip to content
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

Jump to bottom

Change "Archived" notifications to "Read" notifications #3554

Merged
merged 2 commits into from
Mar 20, 2020
Merged

Change "Archived" notifications to "Read" notifications #3554

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
afc5a8f
Change archived to read
gupta-anmol Mar 20, 2020
30dd7ba
Change string names
gupta-anmol Mar 20, 2020
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
8 changes: 4 additions & 4 deletions app/src/main/java/fr/free/nrw/commons/notification/NotificationActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
// Handle item selection
switch (item.getItemId()) {
case R.id.archived:
if (item.getTitle().equals(getString(R.string.menu_option_archived))) {
if (item.getTitle().equals(getString(R.string.menu_option_read))) {
NotificationActivity.startYourself(NotificationActivity.this, "read");
}else if (item.getTitle().equals(getString(R.string.menu_option_unread))) {
onBackPressed();
Expand Down Expand Up @@ -252,7 +252,7 @@ public static void startYourself(Context context, String title) {
private void setPageTitle() {
if (getSupportActionBar() != null) {
if (getIntent().getStringExtra("title").equals("read")) {
getSupportActionBar().setTitle(R.string.archived_notifications);
getSupportActionBar().setTitle(R.string.read_notifications);
} else {
getSupportActionBar().setTitle(R.string.notifications);
}
Expand All @@ -261,7 +261,7 @@ private void setPageTitle() {

private void setEmptyView() {
if (getIntent().getStringExtra("title").equals("read")) {
noNotificationText.setText(R.string.no_archived_notification);
noNotificationText.setText(R.string.no_read_notification);
}else {
noNotificationText.setText(R.string.no_notification);
}
Expand All @@ -272,7 +272,7 @@ private void setMenuItemTitle() {
notificationMenuItem.setTitle(R.string.menu_option_unread);

}else {
notificationMenuItem.setTitle(R.string.menu_option_archived);
notificationMenuItem.setTitle(R.string.menu_option_read);

}
}
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/menu/menu_notifications.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:icon="@drawable/ic_more_vert_white_24dp"
android:title="@string/menu_option_archived" />
android:title="@string/menu_option_read" />
</menu>
2 changes: 1 addition & 1 deletion app/src/main/res/values-af/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@
<string name="contributions_fragment">bydraes</string>
<string name="nearby_fragment">Naby</string>
<string name="notifications">Kennisgewings</string>
<string name="archived_notifications">Kennisgewings (geargiveer)</string>
<string name="read_notifications">Kennisgewings (geargiveer)</string>
<string name="display_nearby_notification">Vertoon kennisgewing in die buurt</string>
<string name="display_nearby_notification_summary">Tik hier om die naaste plek te sien waar u foto\'s benodig</string>
<string name="no_close_nearby">Geen nabygeleë plekke gevind nie</string>
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/res/values-ar/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@
<string name="contributions_fragment">مساهمات</string>
<string name="nearby_fragment">مجاور</string>
<string name="notifications">الإشعارات</string>
<string name="archived_notifications">الإخطارات (مؤرشفة)</string>
<string name="read_notifications">الإخطارات (مؤرشفة)</string>
<string name="display_nearby_notification">عرض الإخطار القريب</string>
<string name="display_nearby_notification_summary">انقر هنا لرؤية أقرب مكان يحتاج إلى صور</string>
<string name="no_close_nearby">لم يتم العثور على أماكن قريبة بالقرب منك</string>
Expand Down Expand Up @@ -504,9 +504,9 @@
<string name="no_image_reverted">لم يتم إرجاع أية صور</string>
<string name="no_image_uploaded">لا توجد صور مرفوعة</string>
<string name="no_notification">ليست لديك إشعارات غير مقروءة</string>
<string name="no_archived_notification">ليست لديك إشعارات مؤرشفة</string>
<string name="no_read_notification">ليست لديك إشعارات مؤرشفة</string>
<string name="share_logs_using">مشاركة السجلات باستخدام</string>
<string name="menu_option_archived">عرض المؤرشفة</string>
<string name="menu_option_read">عرض المؤرشفة</string>
<string name="menu_option_unread">عرض غير المقروءة</string>
<string name="error_occurred_in_picking_images">حدث خطأ أثناء التقاط الصور</string>
<string name="image_chooser_title">اختيار الصور للرفع</string>
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/res/values-ast/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@
<string name="contributions_fragment">Collaboraciones</string>
<string name="nearby_fragment">Cercanu</string>
<string name="notifications">Avisos</string>
<string name="archived_notifications">Avisos (archivaos)</string>
<string name="read_notifications">Avisos (archivaos)</string>
<string name="display_nearby_notification">Amosar notificaciones de cercanía</string>
<string name="display_nearby_notification_summary">Toca equí para ver el llugar más cercanu que precisa semeyes</string>
<string name="no_close_nearby">Nun s\'atoparon llugares cercanos nos alredores</string>
Expand Down Expand Up @@ -492,9 +492,9 @@
<string name="no_image_reverted">Nun se revertió nenguna imaxe</string>
<string name="no_image_uploaded">Nun se xubió nenguna imaxe</string>
<string name="no_notification">Nun tienes avisos ensin lleer</string>
<string name="no_archived_notification">Nun tienes avisos archivaos</string>
<string name="no_read_notification">Nun tienes avisos archivaos</string>
<string name="share_logs_using">Compartir rexistros usando</string>
<string name="menu_option_archived">Ver los archivaos</string>
<string name="menu_option_read">Ver los archivaos</string>
<string name="menu_option_unread">Ver los nun lleíos</string>
<string name="error_occurred_in_picking_images">Asocedió un error al escoyer les imaxes</string>
<string name="image_chooser_title">Escueyi les imaxes pa xubir</string>
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/res/values-bg/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@
<string name="preference_author_name_toggle">Използване на персонализирано авторско име</string>
<string name="preference_author_name_toggle_summary">При качването използвайте персонализирано авторско име вместо потребителското си име</string>
<string name="preference_author_name">Персонализирано авторско име</string>
<string name="archived_notifications">Известия (архивирани)</string>
<string name="read_notifications">Известия (архивирани)</string>
<string name="list_sheet">Списък</string>
<string name="next">Следваща</string>
<string name="submit">Изпращане</string>
Expand Down Expand Up @@ -244,9 +244,9 @@
<string name="no_image_reverted">Няма върнати изображения</string>
<string name="no_image_uploaded">Няма качени изображения</string>
<string name="no_notification">Нямате непрочетени известия</string>
<string name="no_archived_notification">Нямате архивирани известия</string>
<string name="no_read_notification">Нямате архивирани известия</string>
<string name="share_logs_using">Споделяне на дневници, използвайки</string>
<string name="menu_option_archived">Преглеждане на архивирани</string>
<string name="menu_option_read">Преглеждане на архивирани</string>
<string name="menu_option_unread">Преглеждане на непрочетени</string>
<string name="error_occurred_in_picking_images">Възникна грешка при избирането на изображенията</string>
<string name="image_chooser_title">Изберете изображения за качване</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-br/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@
<string name="error_occurred">Ur fazi zo bet !</string>
<string name="preference_author_name_toggle">Implijit un anv aozer personelaet</string>
<string name="nearby_fragment">Nepell</string>
<string name="archived_notifications">Kemennoù(diellaouet)</string>
<string name="read_notifications">Kemennoù(diellaouet)</string>
<string name="next">War-lerc\'h</string>
<string name="previous">Kent</string>
<string name="submit">Kas</string>
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/res/values-ca/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@
<string name="contributions_fragment">Contribucions</string>
<string name="nearby_fragment">A prop</string>
<string name="notifications">Notificacions</string>
<string name="archived_notifications">Notificacions (arxivades)</string>
<string name="read_notifications">Notificacions (arxivades)</string>
<string name="display_nearby_notification">Mostra notificacions properes</string>
<string name="display_nearby_notification_summary">Feu un toc aquí per a veure el lloc més proper que necessiti fotos</string>
<string name="no_close_nearby">No s\'han trobat llocs propers prop vostre</string>
Expand Down Expand Up @@ -437,9 +437,9 @@
<string name="no_image_reverted">No s\'ha revertit cap imatge</string>
<string name="no_image_uploaded">No s\'ha carregat cap imatge</string>
<string name="no_notification">No teniu cap notificació sense llegir</string>
<string name="no_archived_notification">No teniu cap notificació arxivada</string>
<string name="no_read_notification">No teniu cap notificació arxivada</string>
<string name="share_logs_using">Comparteix els registres utilitzant</string>
<string name="menu_option_archived">Mostra els arxivats</string>
<string name="menu_option_read">Mostra els arxivats</string>
<string name="menu_option_unread">Mostra aquelles per llegir</string>
<string name="error_occurred_in_picking_images">S\'ha produït un error en escollir les imatges</string>
<string name="image_chooser_title">Trieu les imatges per carregar</string>
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/res/values-cs/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@
<string name="contributions_fragment">Příspěvky</string>
<string name="nearby_fragment">Poblíž</string>
<string name="notifications">Upozornění</string>
<string name="archived_notifications">Upozornění (přečtená)</string>
<string name="read_notifications">Upozornění (přečtená)</string>
<string name="display_nearby_notification">Zobrazit upozornění v okolí</string>
<string name="display_nearby_notification_summary">Klepnutím sem zobrazíte nejbližší místo, které potřebuje obrázky</string>
<string name="no_close_nearby">Nebyla nalezena žádná místa v okolí</string>
Expand Down Expand Up @@ -508,9 +508,9 @@
<string name="no_image_reverted">Žádné revertované obrázky</string>
<string name="no_image_uploaded">Žádné nahrané obrázky</string>
<string name="no_notification">Nemáte žádná nepřečtená upozornění</string>
<string name="no_archived_notification">Nemáte nepřečtená upozornění</string>
<string name="no_read_notification">Nemáte nepřečtená upozornění</string>
<string name="share_logs_using">Sdílet logy pomocí</string>
<string name="menu_option_archived">Zobrazit přečtené</string>
<string name="menu_option_read">Zobrazit přečtené</string>
<string name="menu_option_unread">Zobrazit nepřečtené</string>
<string name="error_occurred_in_picking_images">Nastala chyba při vybírání obrázků</string>
<string name="image_chooser_title">Vyberte obrázky, které chcete nahrát</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-da/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@
<string name="review_thanks_no_button_text">Næste billede</string>
<string name="no_image">Ingen billeder brugt</string>
<string name="share_logs_using">Del logs ved hjælp af</string>
<string name="menu_option_archived">Vis arkiverede</string>
<string name="menu_option_read">Vis arkiverede</string>
<string name="menu_option_unread">Vis ulæste</string>
<string name="error_occurred_in_picking_images">Der opstod en fejl under udvælgelse af billeder</string>
<string name="please_wait">Vent venligst…</string>
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/res/values-de/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@
<string name="contributions_fragment">Beiträge</string>
<string name="nearby_fragment">In der Nähe</string>
<string name="notifications">Benachrichtigungen</string>
<string name="archived_notifications">Benachrichtigungen (archiviert)</string>
<string name="read_notifications">Benachrichtigungen (archiviert)</string>
<string name="display_nearby_notification">Benachrichtigungen in der Nähe anzeigen</string>
<string name="display_nearby_notification_summary">Hier tippen, um Orte in der Nähe anzusehen, die Bilder benötigen.</string>
<string name="no_close_nearby">Keine Orte in deiner Umgebung gefunden.</string>
Expand Down Expand Up @@ -501,9 +501,9 @@
<string name="no_image_reverted">Keine Bilder zurückgesetzt</string>
<string name="no_image_uploaded">Keine Bilder hochgeladen</string>
<string name="no_notification">Du hast keine ungelesenen Benachrichtigungen</string>
<string name="no_archived_notification">Du hast keine archivierten Benachrichtigungen</string>
<string name="no_read_notification">Du hast keine archivierten Benachrichtigungen</string>
<string name="share_logs_using">Lognutzung teilen</string>
<string name="menu_option_archived">Archivierte ansehen</string>
<string name="menu_option_read">Archivierte ansehen</string>
<string name="menu_option_unread">Ungelesene ansehen</string>
<string name="error_occurred_in_picking_images">Beim Auswählen der Bilder ist ein Fehler aufgetreten</string>
<string name="image_chooser_title">Hochzuladende Bilder auswählen</string>
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/res/values-diq/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@
<string name="preference_author_name_toggle">Nameyê nuştekariyo xısusiyi bıgurene</string>
<string name="preference_author_name">Nameyê nuştekariyo xısusi</string>
<string name="contributions_fragment">İştıraki</string>
<string name="archived_notifications">Xeberi (arşifkerdeyi)</string>
<string name="read_notifications">Xeberi (arşifkerdeyi)</string>
<string name="list_sheet">Liste</string>
<string name="next">Bahdoyên</string>
<string name="previous">Verên</string>
Expand All @@ -256,8 +256,8 @@
<string name="nominate_for_deletion_done">Temam</string>
<string name="review_thanks_yes_button_text">Eya, çıra mebo</string>
<string name="no_notification">Beyanatên şımayê nêwendeyi çıniyê</string>
<string name="no_archived_notification">Beyanatên şımayê arçivkerdeyi çıniyê</string>
<string name="menu_option_archived">Arşivkerdeyan bıvêne</string>
<string name="no_read_notification">Beyanatên şımayê arçivkerdeyi çıniyê</string>
<string name="menu_option_read">Arşivkerdeyan bıvêne</string>
<string name="menu_option_unread">Nêwendeyan bıvêne</string>
<string name="please_wait">Kerem kerên, bıpawên...</string>
<string name="skip_image" fuzzy="true">NÊ RESIMİ RAVİYARNE</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-el/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,7 @@
<string name="no_image">Δεν χρησιμοποιούνται εικόνες</string>
<string name="no_image_uploaded">Δεν έχουν ανεβεί εικόνες</string>
<string name="no_notification">Δεν έχετε αδιάβαστες ενημερώσεις</string>
<string name="no_archived_notification">Δεν έχετε αρχειοθετημένες ενημερώσεις</string>
<string name="no_read_notification">Δεν έχετε αρχειοθετημένες ενημερώσεις</string>
<string name="please_wait">Παρακαλούμε περιμένετε…</string>
<string name="exif_tag_name_author">Δημιουργός</string>
<string name="exif_tag_name_copyright">Πνευματικά δικαιώματα</string>
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/res/values-eo/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@
<string name="contributions_fragment">Kontribuoj</string>
<string name="nearby_fragment">Apude</string>
<string name="notifications">Sciigoj</string>
<string name="archived_notifications">Sciigoj (enarkivigitaj)</string>
<string name="read_notifications">Sciigoj (enarkivigitaj)</string>
<string name="display_nearby_notification">Montri sciigojn pri apudaĵoj</string>
<string name="display_nearby_notification_summary">Tuŝetu ĉi tie por vidi apudan lokon kiu bezonas bildojn</string>
<string name="no_close_nearby">Neniu proksima loko trovita ĉe vi.</string>
Expand Down Expand Up @@ -494,9 +494,9 @@
<string name="no_image_reverted">Neniu bildo estis malfarita</string>
<string name="no_image_uploaded">Neniu alŝutita bildo</string>
<string name="no_notification">Vi ne havas nelegitajn sciigojn</string>
<string name="no_archived_notification">Vi ne havas enarkivigitajn sciigojn</string>
<string name="no_read_notification">Vi ne havas enarkivigitajn sciigojn</string>
<string name="share_logs_using">Konigi protokolojn per</string>
<string name="menu_option_archived">Vidi enarkivigitojn</string>
<string name="menu_option_read">Vidi enarkivigitojn</string>
<string name="menu_option_unread">Vidi nelegitojn</string>
<string name="error_occurred_in_picking_images">Eraro okazis dum elektado de bildoj</string>
<string name="image_chooser_title">Elekti alŝutotajn bildojn</string>
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/res/values-es/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,7 @@
<string name="contributions_fragment">Contribuciones</string>
<string name="nearby_fragment">Cercanos</string>
<string name="notifications">Notificaciones</string>
<string name="archived_notifications">Notificaciones (archivadas)</string>
<string name="read_notifications">Notificaciones (archivadas)</string>
<string name="display_nearby_notification">Mostrar notificaciones de cercanía</string>
<string name="display_nearby_notification_summary">Toca aquí para ver el lugar más cercano que necesita fotos</string>
<string name="no_close_nearby">No se encontraron lugares cercanos cerca de ti</string>
Expand Down Expand Up @@ -517,9 +517,9 @@
<string name="no_image_reverted">Ninguna imagen revertida</string>
<string name="no_image_uploaded">Ninguna imagen subida</string>
<string name="no_notification">No tienes notificaciones sin leer</string>
<string name="no_archived_notification">No tienes notificaciones archivadas</string>
<string name="no_read_notification">No tienes notificaciones archivadas</string>
<string name="share_logs_using">Compartir registros usando</string>
<string name="menu_option_archived">Ver archivados</string>
<string name="menu_option_read">Ver archivados</string>
<string name="menu_option_unread">Ver no leidas</string>
<string name="error_occurred_in_picking_images">Ocurrió un error mientras se elegían imagenes</string>
<string name="image_chooser_title">Elige imágenes para cargar</string>
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/res/values-fa/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,7 @@
<string name="contributions_fragment">مشارکت‌ها</string>
<string name="nearby_fragment">در نزدیکی</string>
<string name="notifications">آگاه‌سازی‌ها</string>
<string name="archived_notifications">اعلان‌ها (بایگانی‌شده)</string>
<string name="read_notifications">اعلان‌ها (بایگانی‌شده)</string>
<string name="display_nearby_notification">نمایش اعلان اطراف</string>
<string name="no_close_nearby">هیچ‌ مکان نزدیکی به شما یافته نشد</string>
<string name="list_sheet">فهرست</string>
Expand Down Expand Up @@ -453,8 +453,8 @@
<string name="no_image_reverted">تصویر برگردانده نشد</string>
<string name="no_image_uploaded">هیچ تصویری بارگذاری نشد</string>
<string name="no_notification">شما هیچ اعلان خوانده‌نشده‌ای ندارید</string>
<string name="no_archived_notification">شما هیچ پیغام بایگانی شده‌ای ندارید</string>
<string name="menu_option_archived">نمایش بایگانی‌شده</string>
<string name="no_read_notification">شما هیچ پیغام بایگانی شده‌ای ندارید</string>
<string name="menu_option_read">نمایش بایگانی‌شده</string>
<string name="menu_option_unread">مشاهده خوانده نشده ها</string>
<string name="image_chooser_title">انتخاب تصویر برای بارگذاری</string>
<string name="please_wait">لطفاً صبر کنید...</string>
Expand Down
Loading