element-hq · bmarty · Aug 21, 2018 · Jul 17, 2018 · Jul 17, 2018 · Jul 17, 2018
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -8,6 +8,7 @@ Improvements:
  - Do not ask permission to write external storage at startup (#2483)
  - Update settings icon and transparent logo for notifications and navigation drawer (#2492)
  - URL previews are no longer requested from the server when displaying URL previews is disabled (PR #2514)
+ - Fix some plural and puzzle strings, and remove other unused ones (#2444)
 
 Other changes:
  - Upgrade olm-sdk.aar from version 2.2.2 to version 2.3.0

diff --git a/vector/src/main/java/im/vector/activity/VectorRoomInviteMembersActivity.java b/vector/src/main/java/im/vector/activity/VectorRoomInviteMembersActivity.java
@@ -353,15 +353,21 @@ private void finish(final List<ParticipantAdapterItem> participantAdapterItems)
                     .setTitle(R.string.dialog_title_confirmation);
 
             String message = "";
+            String msgPartA = "";
+            String msgPartB = "";
 
             if (displayNames.size() == 1) {
                 message = displayNames.get(0);
             } else {
                 for (int i = 0; i < (displayNames.size() - 2); i++) {
-                    message += displayNames.get(i) + ", ";
+                    msgPartA += getString(R.string.room_participants_invite_join_names, displayNames.get(i));
                 }
 
-                message += displayNames.get(displayNames.size() - 2) + " " + getText(R.string.and) + " " + displayNames.get(displayNames.size() - 1);
+                msgPartB = getString(R.string.room_participants_invite_join_names_and,
+                                     displayNames.get(displayNames.size() - 2),
+                                     displayNames.get(displayNames.size() - 1));
+                message = getString(R.string.room_participants_invite_join_names_combined,
+                                    msgPartA, msgPartB);
             }
 
             builder.setMessage(getString(R.string.room_participants_invite_prompt_msg, message))

diff --git a/vector/src/main/java/im/vector/adapters/VectorPublicRoomsAdapter.java b/vector/src/main/java/im/vector/adapters/VectorPublicRoomsAdapter.java
@@ -82,14 +82,9 @@ public View getView(int position, View convertView, ViewGroup parent) {
         roomNameTxtView.setText(roomName);
 
         // display the number of users
-        String usersText;
-        if (publicRoom.numJoinedMembers > 1) {
-            usersText = publicRoom.numJoinedMembers + " " + mContext.getString(R.string.users);
-        } else {
-            usersText = publicRoom.numJoinedMembers + " " + mContext.getString(R.string.user);
-        }
-
-        timestampTxtView.setText(usersText);
+        timestampTxtView.setText(mContext.getResources().getQuantityString(R.plurals.public_room_nb_users,
+                                                                           publicRoom.numJoinedMembers,
+                                                                           publicRoom.numJoinedMembers));
 
         // separator
         separatorView.setVisibility(View.VISIBLE);

diff --git a/vector/src/main/java/im/vector/fragments/GroupDetailsHomeFragment.java b/vector/src/main/java/im/vector/fragments/GroupDetailsHomeFragment.java
@@ -142,8 +142,8 @@ public void refreshViews() {
         int roomCount = (null != group.getGroupRooms()) ? group.getGroupRooms().getEstimatedRoomCount() : 0;
         int memberCount = (null != group.getGroupUsers()) ? group.getGroupUsers().getEstimatedUsersCount() : 1;
 
-        mGroupRoomsTextView.setText((1 == roomCount) ? getString(R.string.group_one_room) : getString(R.string.group_rooms, roomCount));
-        mGroupMembersTextView.setText((1 == memberCount) ? getString(R.string.group_one_member) : getString(R.string.group_members, memberCount));
+        mGroupRoomsTextView.setText(getResources().getQuantityString(R.plurals.group_rooms, roomCount, roomCount));
+        mGroupMembersTextView.setText(getResources().getQuantityString(R.plurals.group_members, memberCount, memberCount));
 
         if (!TextUtils.isEmpty(group.getLongDescription())) {
             mGroupHtmlTextView.setVisibility(View.VISIBLE);

diff --git a/vector/src/main/java/im/vector/fragments/VectorRoomDetailsMembersFragment.java b/vector/src/main/java/im/vector/fragments/VectorRoomDetailsMembersFragment.java
@@ -866,7 +866,8 @@ public void onSelectUserId(String userId) {
                 List<String> userIds = mAdapter.getSelectedUserIds();
 
                 if (0 != userIds.size()) {
-                    setActivityTitle(userIds.size() + " " + getString(R.string.room_details_selected));
+                    setActivityTitle(getResources().getQuantityString(R.plurals.room_details_selected,
+                                                                      userIds.size(), userIds.size()));
                 } else {
                     resetActivityTitle();
                 }

diff --git a/vector/src/main/java/im/vector/util/VectorUtils.java b/vector/src/main/java/im/vector/util/VectorUtils.java
@@ -871,16 +871,24 @@ private static String formatSecondsIntervalFloored(Context context, long seconds
         String formattedString;
 
         if (secondsInterval < 0) {
-            formattedString = "0" + context.getString(R.string.format_time_s);
+            formattedString = context.getResources().getQuantityString(R.plurals.format_time_s, 0, 0);
         } else {
             if (secondsInterval < 60) {
-                formattedString = secondsInterval + context.getString(R.string.format_time_s);
+                formattedString = context.getResources().getQuantityString(R.plurals.format_time_s,
+                                                                           (int) secondsInterval,
+                                                                           (int) secondsInterval);
             } else if (secondsInterval < 3600) {
-                formattedString = (secondsInterval / 60) + context.getString(R.string.format_time_m);
+                formattedString = context.getResources().getQuantityString(R.plurals.format_time_m,
+                                                                           (int) (secondsInterval / 60),
+                                                                           (int) (secondsInterval / 60));
             } else if (secondsInterval < 86400) {
-                formattedString = (secondsInterval / 3600) + context.getString(R.string.format_time_h);
+                formattedString = context.getResources().getQuantityString(R.plurals.format_time_h,
+                                                                           (int) (secondsInterval / 3600),
+                                                                           (int) (secondsInterval / 3600));
             } else {
-                formattedString = (secondsInterval / 86400) + context.getString(R.string.format_time_d);
+                formattedString = context.getResources().getQuantityString(R.plurals.format_time_d,
+                                                                           (int) (secondsInterval / 86400),
+                                                                           (int) (secondsInterval / 86400));
             }
         }
 
@@ -977,10 +985,11 @@ public void onUnexpectedError(Exception e) {
 
         if (presenceText != null) {
             if ((null != user.currently_active) && user.currently_active) {
-                presenceText += " " + context.getString(R.string.room_participants_now);
+                presenceText = context.getString(R.string.room_participants_now, presenceText);
             } else if ((null != user.lastActiveAgo) && (user.lastActiveAgo > 0)) {
-                presenceText += " " + formatSecondsIntervalFloored(context,
-                        user.getAbsoluteLastActiveAgo() / 1000L) + " " + context.getString(R.string.room_participants_ago);
+                presenceText = context.getString(R.string.room_participants_ago, presenceText,
+                                                 formatSecondsIntervalFloored(context,
+                                                    user.getAbsoluteLastActiveAgo() / 1000L));
             }
         }
 

diff --git a/vector/src/main/res/values-ar/strings.xml b/vector/src/main/res/values-ar/strings.xml
@@ -72,13 +72,13 @@
     <string name="no_room_placeholder">لا غرف</string>
     <string name="no_public_room_placeholder">لا غرف عمومية متوفرة</string>
     <plurals name="public_room_nb_users">
-	<item quantity="zero">لا مستخدمين</item>
-	<item quantity="one">مستخدم واحد</item>
-	<item quantity="two">مستخدمان</item>
-	<item quantity="few">%d مستخدمين</item>
-	<item quantity="many">%d مستخدما</item>
-	<item quantity="other">%d مستخدم</item>
-</plurals>
+        <item quantity="zero">لا مستخدمين</item>
+        <item quantity="one">مستخدم واحد</item>
+        <item quantity="two">مستخدمان</item>
+        <item quantity="few">%d مستخدمين</item>
+        <item quantity="many">%d مستخدما</item>
+        <item quantity="other">%d مستخدم</item>
+    </plurals>
 
     <string name="send_bug_report_include_logs">أرسِل السجلات</string>
     <string name="send_bug_report_include_crash_logs">أرسِل سجلات الانهيار</string>
@@ -202,10 +202,6 @@
     <string name="room_creation_title">دردشة جديدة</string>
     <string name="room_creation_add_member">أضِف عضوا</string>
     <string name="room_e2e_alert_title">تحذير!</string>
-    <string name="format_time_s">ثا</string>
-    <string name="format_time_m">دق</string>
-    <string name="format_time_h">سا</string>
-    <string name="format_time_d">يوم</string>
 
     <string name="room_participants_leave_prompt_title">ترك الغرفة</string>
     <string name="room_participants_leave_prompt_msg">أمتأكّد من ترك الغرفة؟</string>
@@ -899,7 +895,6 @@
 
     <!-- group details -->
     <string name="title_activity_room">الغرفة</string>
-    <string name="and">و</string>
     <string name="groups_invite_header">دعوة</string>
     <string name="send_files_in">أرسل إلى</string>
     <string name="title_activity_choose_sticker">أرسِل ملصقا</string>
@@ -928,8 +923,6 @@
     <string name="room_participants_online">متّصل</string>
     <string name="room_participants_offline">غير متّصل</string>
     <string name="room_participants_idle">خامل</string>
-    <string name="room_participants_now">الآن</string>
-    <string name="room_participants_ago"/>
 
     <string name="settings_notification_privacy">خصوصيّة الإخطارات</string>
     <string name="settings_notification_privacy_warning">يعمل Riot.im في الخلفية ليُبقي محتوى رسائل الإخطارات خاصًّا. يمكنك تغيير هذا الخيار لتقليل استخدام البطارية.</string>

diff --git a/vector/src/main/res/values-bg/strings.xml b/vector/src/main/res/values-bg/strings.xml
@@ -15,11 +15,6 @@
     <string name="title_activity_settings">Настройки</string>
     <string name="ssl_fingerprint_example">00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</string>
 
-    <string name="format_time_s">сек</string>
-    <string name="format_time_m">мин</string>
-    <string name="format_time_h">ч</string>
-    <string name="format_time_d">д</string>
-
     <string name="compression_options">"Изпратете с размер "</string>
     <string name="compression_opt_list_original">Оригинален</string>
     <string name="compression_opt_list_large">Голям</string>
@@ -67,8 +62,6 @@
     <string name="room_participants_online">Онлайн</string>
     <string name="room_participants_offline">Офлайн</string>
     <string name="room_participants_idle">Неактивен</string>
-    <string name="room_participants_now">сега</string>
-    <string name="room_participants_ago">по-рано</string>
 
     <string name="room_participants_header_admin_tools">ИНСТРУМЕНТИ НА АДМИНИСТРАТОРА</string>
     <string name="room_participants_header_direct_chats">ДИРЕКТНИ ЧАТОВЕ</string>
@@ -127,7 +120,6 @@
     <string name="room_no_conference_call_in_encrypted_rooms">Групови разговори не се поддържат в шифровани стаи</string>
     <string name="send_anyway">Изпрати въпреки това</string>
     <string name="or">или</string>
-    <string name="and">и</string>
     <string name="invite">Покани</string>
     <string name="offline">Офлайн</string>
 
@@ -177,9 +169,9 @@
     <string name="no_room_placeholder">Няма стаи</string>
     <string name="no_public_room_placeholder">Няма налични публични стаи</string>
     <plurals name="public_room_nb_users">
-	<item quantity="one">1 потребител</item>
-	<item quantity="other">%d потребители</item>
-</plurals>
+        <item quantity="one">1 потребител</item>
+        <item quantity="other">%d потребители</item>
+    </plurals>
 
     <string name="groups_invite_header">Покани</string>
     <string name="groups_header">Общности</string>
@@ -207,8 +199,6 @@
     <string name="logout">Изход</string>
     <string name="hs_url">URL на Home сървър</string>
     <string name="identity_url">URL на сървър за самоличност</string>
-    <string name="user">потребител</string>
-    <string name="users">потребители</string>
     <string name="search">Търсене</string>
 
     <string name="start_new_chat">Започни нов чат</string>
@@ -372,7 +362,6 @@
     <string name="room_details_people">Хора</string>
     <string name="room_details_files">Файлове</string>
     <string name="room_details_settings">Настройки</string>
-    <string name="room_details_selected">избран</string>
     <string name="malformed_id">Грешно формиранo ID. Трябва да бъде имейл адрес или Matrix ID, например \'@localpart:domain\'</string>
     <string name="room_details_people_invited_group_name">ПОКАНЕНИ</string>
     <string name="room_event_action_report_prompt_reason">Причина за докладване на това съдържание</string>
@@ -415,12 +404,10 @@
     <string name="room_recents_join_room_prompt">Напишете ID или псевдоним на стая</string>
 
     <string name="directory_search_results_title">Прегледай директорията</string>
-    <string name="directory_search_room">%1$d стая</string>
     <plurals name="directory_search_rooms">
 	<item quantity="one">1 стая</item>
 	<item quantity="other">%d стаи</item>
 </plurals>
-    <string name="directory_search_room_for">%1$d стаи намерени за %2$s</string>
     <plurals name="directory_search_rooms_for">
 	<item quantity="one">%1$s стая намерена за %2$s</item>
 	<item quantity="other">%1$s стаи намерени за %2$s</item>
@@ -885,11 +872,6 @@
     <string name="filter_group_members">Филтриране на членовете</string>
     <string name="filter_group_rooms">Филтриране на стаите</string>
 
-    <string name="group_one_member">1 член</string>
-    <string name="group_members">%d членове</string>
-
-    <string name="group_one_room">1 стая</string>
-    <string name="group_rooms">%d стаи</string>
     <string name="group_no_long_description">Администраторът на общността не е предоставил дълго описание за тази общност.</string>
 
     <string name="has_been_kicked">Бяхте изгонен от %1$s от %2$s</string>

diff --git a/vector/src/main/res/values-bs/strings.xml b/vector/src/main/res/values-bs/strings.xml
@@ -48,7 +48,6 @@
     <string name="room_no_conference_call_in_encrypted_rooms">Konferencijski pozivi nisu podržani u šifriranim sobama</string>
     <string name="send_anyway">Ipak pošalji</string>
     <string name="or">ili</string>
-    <string name="and">i</string>
     <string name="invite">Pozovi</string>
     <string name="offline">Offline</string>
 
@@ -94,11 +93,6 @@ Odaberite eksport kako biste napravili rezervu prije odjavljivanja.</string>
     <string name="rooms_directory_header">Imenik soba</string>
     <string name="no_room_placeholder">Nema soba</string>
     <string name="no_public_room_placeholder">Nema dostupnih javnih soba</string>
-    <plurals name="public_room_nb_users">
-	<item quantity="one">Jedan</item>
-	<item quantity="few">Nekoliko</item>
-	<item quantity="other">Drugi</item>
-</plurals>
 
     <string name="send_bug_report_include_logs">Pošaljite zapise</string>
     <string name="send_bug_report_include_crash_logs">Pošaljite keš zapise</string>
@@ -124,8 +118,6 @@ Odaberite eksport kako biste napravili rezervu prije odjavljivanja.</string>
     <string name="logout">Odjavi se</string>
     <string name="hs_url">URL lokalnog servera</string>
     <string name="identity_url">URL identitet servera</string>
-    <string name="user">korisnik</string>
-    <string name="users">korisnici</string>
     <string name="search">Traži</string>
 
     <string name="start_new_chat">Započni Novi Razgovor</string>
@@ -304,10 +296,6 @@ Uređaji još uvijek neće moći dešifrirati istoriju prije nego što se pridru
 
 Šifrirane poruke neće biti vidljive na klijentima koji još ne provode šifriranje.</string>
 
-    <string name="format_time_m">m</string>
-    <string name="format_time_h">h</string>
-    <string name="format_time_d">d</string>
-
     <string name="room_participants_leave_prompt_title">Napusti sobu</string>
     <string name="room_participants_leave_prompt_msg">Da li ste sigurni da želite napustiti sobu?</string>
     <string name="room_participants_remove_prompt_msg">Da li ste sigurni da želite ukloniti % iz ovog razgovora?</string>
@@ -316,8 +304,6 @@ Uređaji još uvijek neće moći dešifrirati istoriju prije nego što se pridru
     <string name="room_participants_online">Online</string>
     <string name="room_participants_offline">Offline</string>
     <string name="room_participants_idle">Idle</string>
-    <string name="room_participants_now">sada</string>
-    <string name="room_participants_ago">prije</string>
 
     <string name="room_participants_header_admin_tools">ADMINISTRATORSKI ALATI</string>
     <string name="room_participants_header_call">POZIV</string>
@@ -385,7 +371,6 @@ Da li ste sigurani?</string>
     <string name="room_details_people">Ljudi</string>
     <string name="room_details_files">Fajlovi</string>
     <string name="room_details_settings">Postavke</string>
-    <string name="room_details_selected">označeno</string>
     <string name="malformed_id">Malformirani ID. Trebao bi biti email adresa ili Matrix ID poput \"@localpart: domain\"</string>
     <string name="room_details_people_invited_group_name">POZVAN</string>
     <string name="room_details_people_present_group_name">PRIKLJUČEN</string>
@@ -421,8 +406,6 @@ Da li ste sigurani?</string>
     <string name="room_recents_join_room_prompt">Upišite ID sobe ili alias sobe</string>
 
     <string name="directory_search_results_title">Pretražite imenik</string>
-    <string name="directory_search_room">%1$d soba</string>
-    <string name="directory_search_room_for">%1$d soba nađena za %2$s</string>
     <string name="directory_searching_title">Traži direktorij..</string>
 
     <string name="room_settings_favourite">Favorit</string>
@@ -505,7 +488,6 @@ Da li ste sigurani?</string>
     <string name="attachment_remaining_time_seconds">%d s</string>
     <string name="attachment_remaining_time_minutes">%1$a %2$i</string>
 
-    <string name="format_time_s">s</string>
     <string name="settings_opt_out_of_analytics_summary">Hepek prikuplja anonimnu analitiku kako bi nam omogućio poboljšanje aplikacije.</string>