Sfoglia il codice sorgente

Change dynamically the maintenance mode message with the name of the app

davigonz 8 anni fa
parent
commit
a417f2ab2b

+ 11 - 11
src/main/java/com/owncloud/android/utils/ErrorMessageAdapter.java

@@ -86,7 +86,7 @@ public class ErrorMessageAdapter {
                     message = res.getString(R.string.filename_forbidden_charaters_from_server);
 
                 } else if (result.getCode() == ResultCode.MAINTENANCE_MODE) {
-                    message = res.getString(R.string.maintenance_mode);
+                    message = String.format(res.getString(R.string.maintenance_mode), res.getString(R.string.app_name));
 
                 } else {
                     message = String.format(
@@ -107,7 +107,7 @@ public class ErrorMessageAdapter {
                     message = res.getString(R.string.downloader_download_file_not_found);
 
                 }  else if (result.getCode() == ResultCode.MAINTENANCE_MODE) {
-                        message = res.getString(R.string.maintenance_mode);
+                        message = String.format(res.getString(R.string.maintenance_mode), res.getString(R.string.app_name));
 
                 } else {
                     message = String.format(
@@ -127,7 +127,7 @@ public class ErrorMessageAdapter {
                             res.getString(R.string.forbidden_permissions_delete));
 
                 } else if (result.getCode() == ResultCode.MAINTENANCE_MODE) {
-                    message = res.getString(R.string.maintenance_mode);
+                    message = String.format(res.getString(R.string.maintenance_mode), res.getString(R.string.app_name));
 
                 } else {
                     message = res.getString(R.string.remove_fail_msg);
@@ -150,7 +150,7 @@ public class ErrorMessageAdapter {
                 message = res.getString(R.string.filename_forbidden_charaters_from_server);
 
             } else if (result.getCode() == ResultCode.MAINTENANCE_MODE) {
-                message = res.getString(R.string.maintenance_mode);
+                message = String.format(res.getString(R.string.maintenance_mode), res.getString(R.string.app_name));
 
             } else {
                 message = res.getString(R.string.rename_server_fail_msg);
@@ -173,7 +173,7 @@ public class ErrorMessageAdapter {
                 message = res.getString(R.string.filename_forbidden_charaters_from_server);
 
             } else if (result.getCode() == ResultCode.MAINTENANCE_MODE) {
-                    message = res.getString(R.string.maintenance_mode);
+                    message = String.format(res.getString(R.string.maintenance_mode), res.getString(R.string.app_name));
 
             } else {
                 message = res.getString(R.string.create_dir_fail_msg);
@@ -194,7 +194,7 @@ public class ErrorMessageAdapter {
                         res.getString(R.string.share_link_forbidden_permissions));
 
             } else if (result.getCode() == ResultCode.MAINTENANCE_MODE) {
-                message = res.getString(R.string.maintenance_mode);
+                message = String.format(res.getString(R.string.maintenance_mode), res.getString(R.string.app_name));
 
             } else {    // Generic error
                 // Show a Message, operation finished without success
@@ -215,7 +215,7 @@ public class ErrorMessageAdapter {
                         res.getString(R.string.unshare_link_forbidden_permissions));
 
             } else if (result.getCode() == ResultCode.MAINTENANCE_MODE) {
-                message = res.getString(R.string.maintenance_mode);
+                message = String.format(res.getString(R.string.maintenance_mode), res.getString(R.string.app_name));
 
             } else {    // Generic error
                 // Show a Message, operation finished without success
@@ -237,7 +237,7 @@ public class ErrorMessageAdapter {
                         res.getString(R.string.update_link_forbidden_permissions));
 
             } else if (result.getCode() == ResultCode.MAINTENANCE_MODE) {
-                message = res.getString(R.string.maintenance_mode);
+                message = String.format(res.getString(R.string.maintenance_mode), res.getString(R.string.app_name));
 
             } else {    // Generic error
                 // Show a Message, operation finished without success
@@ -262,7 +262,7 @@ public class ErrorMessageAdapter {
                 message = res.getString(R.string.filename_forbidden_charaters_from_server);
 
             } else if (result.getCode() == ResultCode.MAINTENANCE_MODE) {
-                message = res.getString(R.string.maintenance_mode);
+                message = String.format(res.getString(R.string.maintenance_mode), res.getString(R.string.app_name));
 
             } else {    // Generic error
                 // Show a Message, operation finished without success
@@ -279,7 +279,7 @@ public class ErrorMessageAdapter {
                             folderPathName);
 
                 } else if (result.getCode() == ResultCode.MAINTENANCE_MODE) {
-                    message = res.getString(R.string.maintenance_mode);
+                    message = String.format(res.getString(R.string.maintenance_mode), res.getString(R.string.app_name));
 
                 } else {    // Generic error
                     // Show a Message, operation finished without success
@@ -303,7 +303,7 @@ public class ErrorMessageAdapter {
                         res.getString(R.string.forbidden_permissions_copy));
 
             } else if (result.getCode() == ResultCode.MAINTENANCE_MODE) {
-                message = res.getString(R.string.maintenance_mode);
+                message = String.format(res.getString(R.string.maintenance_mode), res.getString(R.string.app_name));
 
             } else {    // Generic error
                 // Show a Message, operation finished without success

+ 1 - 1
src/main/res/values/strings.xml

@@ -543,7 +543,7 @@
     <string name="local_file_not_found_toast">File not found in local file system</string>
     <string name="confirmation_remove_files_alert">Do you really want to remove the selected items?</string>
     <string name="confirmation_remove_folders_alert">Do you really want to remove the selected items and their contents?</string>
-    <string name="maintenance_mode">This ownCloud server is in maintenance mode, please try again later.</string>
+    <string name="maintenance_mode">This %1$s server is in maintenance mode, please try again later.</string>
 
     <string name="uploads_view_upload_status_waiting_for_charging">Awaiting charge</string>
     <string name="actionbar_search">Search</string>