Browse Source

new string for traslation

Marino Faggiana 8 years ago
parent
commit
613274fd4e
2 changed files with 15 additions and 6 deletions
  1. 14 6
      iOSClient/Main/CCMain.m
  2. 1 0
      iOSClient/en.lproj/Localizable.strings

+ 14 - 6
iOSClient/Main/CCMain.m

@@ -191,10 +191,14 @@
     self.searchController.searchBar.barTintColor = COLOR_SEPARATOR_TABLE;
     [self.searchController.searchBar sizeToFit];
     
-    if ([CCCoreData getServerVersionActiveAccount:app.activeAccount] >= 12 && _isRoot)
-        self.searchController.searchBar.placeholder = NSLocalizedString(@"_search_all_folders_",nil);
-    else
+    if ([CCCoreData getServerVersionActiveAccount:app.activeAccount] >= 12) {
+        if (_isRoot)
+            self.searchController.searchBar.placeholder = NSLocalizedString(@"_search_all_folders_",nil);
+        else
+            self.searchController.searchBar.placeholder = NSLocalizedString(@"_search_sub_folder_",nil);
+    } else {
         self.searchController.searchBar.placeholder = NSLocalizedString(@"_search_this_folder_",nil);
+    }
 }
 
 // Apparirà
@@ -1107,10 +1111,14 @@
     [CCCoreData setServerVersionActiveAccount:app.activeAccount versionMajor:capabilities.versionMajor versionMinor:capabilities.versionMinor versionMicro:capabilities.versionMicro];
     
     // Search placeholder
-    if (capabilities.versionMajor >= 12 && _isRoot)
-        self.searchController.searchBar.placeholder = NSLocalizedString(@"_search_all_folders_",nil);
-    else
+    if (capabilities.versionMajor >= 12) {
+        if (_isRoot)
+            self.searchController.searchBar.placeholder = NSLocalizedString(@"_search_all_folders_",nil);
+        else
+            self.searchController.searchBar.placeholder = NSLocalizedString(@"_search_sub_folder_",nil);
+    } else {
         self.searchController.searchBar.placeholder = NSLocalizedString(@"_search_this_folder_",nil);
+    }
 }
 
 - (void)getFeaturesSupportedByServerSuccess:(BOOL)hasCapabilitiesSupport hasForbiddenCharactersSupport:(BOOL)hasForbiddenCharactersSupport hasShareSupport:(BOOL)hasShareSupport hasShareeSupport:(BOOL)hasShareeSupport

+ 1 - 0
iOSClient/en.lproj/Localizable.strings

@@ -399,6 +399,7 @@
 
 "_search_this_folder_"          = "Search in this folder";
 "_search_all_folders_"          = "Search in all folders";
+"_search_sub_folder_"           = "Search in this folder and subfolders";
 
 // Security