Эх сурвалжийг харах

Improve descriptive strings based on review feedback

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
Andy Scherzinger 4 жил өмнө
parent
commit
19cd3e4c79

+ 5 - 22
app/src/main/java/com/nextcloud/talk/controllers/ProfileController.java

@@ -749,38 +749,21 @@ public class ProfileController extends BaseController {
 
                 switch (item.scope) {
                     case PRIVATE:
-                        holder.scope.setImageResource(R.drawable.ic_password);
-                        holder.scope.setContentDescription(
-                                controller.getActivity().getResources().getString(
-                                        R.string.scope_toggle_description,
-                                        item.hint,
-                                        controller.getActivity().getString(R.string.scope_private_title)));
-                        break;
                     case LOCAL:
                         holder.scope.setImageResource(R.drawable.ic_password);
-                        holder.scope.setContentDescription(
-                                controller.getActivity().getResources().getString(
-                                        R.string.scope_toggle_description,
-                                        item.hint,
-                                        controller.getActivity().getString(R.string.scope_local_title)));
                         break;
                     case FEDERATED:
                         holder.scope.setImageResource(R.drawable.ic_contacts);
-                        holder.scope.setContentDescription(
-                                controller.getActivity().getResources().getString(
-                                        R.string.scope_toggle_description,
-                                        item.hint,
-                                        controller.getActivity().getString(R.string.scope_federated_title)));
                         break;
                     case PUBLISHED:
                         holder.scope.setImageResource(R.drawable.ic_link);
-                        holder.scope.setContentDescription(
-                                controller.getActivity().getResources().getString(
-                                        R.string.scope_toggle_description,
-                                        item.hint,
-                                        controller.getActivity().getString(R.string.scope_published_title)));
                         break;
                 }
+
+                holder.scope.setContentDescription(
+                        controller.getActivity().getResources().getString(
+                                R.string.scope_toggle_description,
+                                item.hint));
             }
 
             holder.icon.setImageResource(item.icon);

+ 3 - 3
app/src/main/res/values/strings.xml

@@ -129,7 +129,7 @@
     <string name="nc_settings_link_previews_key" translatable="false">link_previews</string>
     <string name="nc_settings_read_privacy_key" translatable="false">read_privacy</string>
     <string name="nc_locked_tap_to_unlock">Tap to unlock</string>
-    <string name="nc_locked">locked</string>
+    <string name="nc_locked">Locked</string>
     <string name="nc_settings_read_privacy_desc">Share my read-status and show the read-status of others</string>
     <string name="nc_settings_read_privacy_title">Read status</string>
 
@@ -236,7 +236,7 @@
     <string name="nc_ok">OK</string>
     <string name="nc_call_name">Conversation name</string>
     <string name="nc_proceed">Proceed</string>
-    <string name="nc_add_emojis">Add Emojis</string>
+    <string name="nc_add_emojis">Add emojis</string>
     <string name="nc_call_name_is_same">The name you entered is the same as the existing one</string>
     <string name="nc_wrong_link">Conversation link is not valid</string>
     <string name="nc_share_text">Join the conversation at %1$s/index.php/call/%2$s</string>
@@ -409,7 +409,7 @@
     <string name="scope_published_title">Published</string>
     <string name="scope_published_description">Synchronize to trusted servers and the global and public address book</string>
     <string name="scope_toggle">Scope toggle</string>
-    <string name="scope_toggle_description">Scope toggle for %1$s (%2$s)</string>
+    <string name="scope_toggle_description">Change privacy level of %1$s</string>
 
     <!-- App Bar -->
     <string name="appbar_search_in">Search in %s</string>