Selaa lähdekoodia

Change the wording

Mario Danic 8 vuotta sitten
vanhempi
commit
d9fa7b616b

+ 3 - 2
res/values-en-rGB/strings.xml

@@ -313,9 +313,10 @@
     <string name="conflict_keep_both">Keep both</string>
     <string name="conflict_use_local_version">local version</string>
     <string name="conflict_use_server_version">server version</string>
-    
+
+    <string name="preview_sorry">Sorry about that!</string>
     <string name="preview_image_description">Image preview</string>
-    <string name="preview_image_error_unknown_format">This image cannot be shown</string>
+    <string name="preview_image_error_unknown_format">Image can\'t be shown</string>
 
     <string name="error__upload__local_file_not_copied">%1$s could not be copied to %2$s local folder</string>
     <string name="prefs_instant_upload_path_title">Instant upload folder</string>

+ 3 - 2
res/values/strings.xml

@@ -313,9 +313,10 @@
     <string name="conflict_keep_both">Keep both</string>
     <string name="conflict_use_local_version">local version</string>
     <string name="conflict_use_server_version">server version</string>
-    
+
+    <string name="preview_sorry">Sorry about that!</string>
     <string name="preview_image_description">Image preview</string>
-    <string name="preview_image_error_unknown_format">This image cannot be shown</string>
+    <string name="preview_image_error_unknown_format">Image can\'t be shown</string>
 
     <string name="error__upload__local_file_not_copied">%1$s could not be copied to %2$s local folder</string>
     <string name="prefs_instant_upload_path_title">Instant upload folder</string>

+ 3 - 2
src/com/owncloud/android/ui/preview/PreviewImageFragment.java

@@ -554,7 +554,7 @@ public class PreviewImageFragment extends FileFragment {
             if (getActivity() != null && (getActivity() instanceof PreviewImageActivity)) {
                 ((PreviewImageActivity) getActivity()).toggleFullScreen();
             }
-            setMessageForMultiList(mErrorMessageId, R.drawable.file_image);
+            setMessageForMultiList(mErrorMessageId, R.string.preview_sorry, R.drawable.file_image);
         }
     }
 
@@ -568,9 +568,10 @@ public class PreviewImageFragment extends FileFragment {
         }
     }
 
-    public void setMessageForMultiList(@StringRes int headline, @DrawableRes int icon) {
+    public void setMessageForMultiList(@StringRes int headline, @StringRes int message, @DrawableRes int icon) {
         if (mMultiListContainer != null && mMultiListMessage != null) {
             mMultiListHeadline.setText(headline);
+            mMultiListMessage.setText(message);
             mMultiListIcon.setImageResource(icon);
 
             mMultiListIcon.setVisibility(View.VISIBLE);