clear code

iOSClient/AppDelegate.m

@@ -351,14 +351,14 @@
         if (_activeMain)
             [_activeMain requestServerCapabilities];
     
-        NSLog(@"[LOG] Initialize Camera Upload");
+        NSLog(@"[LOG] Initialize Auto upload");
         [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadName:@"initStateAutoUpload" object:nil];
         
         NSLog(@"[LOG] Listning Favorites");
         [[CCSynchronize sharedSynchronize] readListingFavorites];        
     });
     
-    // Initialize Camera Upload
+    // Initialize Auto upload
     //[[NSNotificationCenter defaultCenter] postNotificationName:@"initStateAutoUpload" object:@{@"afterDelay": @(2)}];
 }
 
@@ -732,7 +732,7 @@
             } else {
                 
                 [TWMessageBarManager sharedInstance].styleSheet = self;
-                [[TWMessageBarManager sharedInstance] showMessageWithTitle:[NSString stringWithFormat:@"%@\n",[CCUtility localizableBrand:title table:nil]] description:[CCUtility localizableBrand:description table:nil] type:type duration:delay];
+                [[TWMessageBarManager sharedInstance] showMessageWithTitle:[NSString stringWithFormat:@"%@\n", NSLocalizedString(title, nil)] description:NSLocalizedString(description, nil) type:type duration:delay];
             }
             
         } else {
@@ -1110,7 +1110,7 @@
     }
 
     viewController.touchIDManager = [[BKTouchIDManager alloc] initWithKeychainServiceName: k_serviceShareKeyChain];
-    viewController.touchIDManager.promptText = [CCUtility localizableBrand:@"_scan_fingerprint_" table:nil];
+    viewController.touchIDManager.promptText = NSLocalizedString(@"_scan_fingerprint_", nil);
 
     UINavigationController *navigationController = [[UINavigationController alloc] initWithRootViewController:viewController];
     return navigationController;

iOSClient/Intro/CCIntro.m

@@ -66,11 +66,11 @@
     if (height >= 1024) { titleIconPositionY = 100; titlePositionY = 290; descPositionY = 250; }
     
     EAIntroPage *page1 = [EAIntroPage page];
-    page1.title = [CCUtility localizableBrand:@"_intro_1_title_" table:@"Intro"];
+    page1.title = NSLocalizedString(@"_intro_1_title_", nil);
     page1.titlePositionY = titlePositionY;
     page1.titleColor = [UIColor blackColor];
     page1.titleFont = [UIFont systemFontOfSize:20];
-    page1.desc = [CCUtility localizableBrand:@"_intro_1_text_" table:@"Intro"];
+    page1.desc = NSLocalizedString(@"_intro_1_text_", nil);
     page1.descPositionY = descPositionY;
     page1.descColor = [UIColor blackColor];
     page1.descFont = [UIFont systemFontOfSize:14];
@@ -80,11 +80,11 @@
     page1.showTitleView = NO;
     
     EAIntroPage *page2 = [EAIntroPage page];
-    page2.title = [CCUtility localizableBrand:@"_intro_2_title_" table:@"Intro"];
+    page2.title = NSLocalizedString(@"_intro_2_title_", nil);
     page2.titlePositionY = titlePositionY;
     page2.titleColor = [UIColor blackColor];
     page2.titleFont = [UIFont systemFontOfSize:20];
-    page2.desc = [CCUtility localizableBrand:@"_intro_2_text_" table:@"Intro"];
+    page2.desc = NSLocalizedString(@"_intro_2_text_", nil);
     page2.descPositionY = descPositionY;
     page2.descColor = [UIColor blackColor];
     page2.descFont = [UIFont systemFontOfSize:14];
@@ -94,11 +94,11 @@
     page2.showTitleView = NO;
 
     EAIntroPage *page3 = [EAIntroPage page];
-    page3.title = [CCUtility localizableBrand:@"_intro_3_title_" table:@"Intro"];
+    page3.title = NSLocalizedString(@"_intro_3_title_", nil);
     page3.titlePositionY = titlePositionY;
     page3.titleColor = [UIColor blackColor];
     page3.titleFont = [UIFont systemFontOfSize:20];
-    page3.desc = [CCUtility localizableBrand:@"_intro_3_text_" table:@"Intro"];
+    page3.desc = NSLocalizedString(@"_intro_3_text_", nil);
     page3.descPositionY = descPositionY;
     page3.descColor = [UIColor blackColor];
     page3.descFont = [UIFont systemFontOfSize:14];

iOSClient/Settings/CCAdvanced.m

@@ -84,7 +84,7 @@
     
     section = [XLFormSectionDescriptor formSectionWithTitle:NSLocalizedString(@"_upload_del_photos_", nil)];
     [form addFormSection:section];
-    section.footerTitle = [CCUtility localizableBrand:@"_upload_del_photos_how_" table:nil];
+    section.footerTitle = NSLocalizedString(@"_upload_del_photos_how_", nil);
     
     row = [XLFormRowDescriptor formRowDescriptorWithTag:@"uploadremovephoto" rowType:XLFormRowDescriptorTypeBooleanSwitch title:NSLocalizedString(@"_upload_del_photos_", nil)];
     if ([CCUtility getUploadAndRemovePhoto]) row.value = @"1";
@@ -112,7 +112,7 @@
     [form addFormSection:section];
     
     // Exit
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:@"esci" rowType:XLFormRowDescriptorTypeButton title:[CCUtility localizableBrand:@"_exit_" table:nil]];
+    row = [XLFormRowDescriptor formRowDescriptorWithTag:@"esci" rowType:XLFormRowDescriptorTypeButton title:NSLocalizedString(@"_exit_", nil)];
     [row.cellConfig setObject:@(NSTextAlignmentLeft) forKey:@"textLabel.textAlignment"];
     [row.cellConfig setObject:[UIColor redColor] forKey:@"textLabel.textColor"];
     [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
@@ -383,7 +383,7 @@
 {
     [self deselectFormRow:sender];
     
-    UIAlertController *alertController = [UIAlertController alertControllerWithTitle:@"" message:[CCUtility localizableBrand:@"_want_exit_" table:nil] preferredStyle:UIAlertControllerStyleActionSheet];
+    UIAlertController *alertController = [UIAlertController alertControllerWithTitle:@"" message:NSLocalizedString(@"_want_exit_", nil) preferredStyle:UIAlertControllerStyleActionSheet];
     
     [alertController addAction: [UIAlertAction actionWithTitle:NSLocalizedString(@"_ok_", nil) style:UIAlertActionStyleDestructive handler:^(UIAlertAction *action) {
         

iOSClient/Settings/CCManageAutoUpload.m

@@ -70,7 +70,7 @@
     
     section = [XLFormSectionDescriptor formSection];
     [form addFormSection:section];
-    section.footerTitle = NSLocalizedString(@"_photo_folder_photocamera_", nil);
+    section.footerTitle = NSLocalizedString(@"_autoupload_description_", nil);
 
     row = [XLFormRowDescriptor formRowDescriptorWithTag:@"autoUpload" rowType:XLFormRowDescriptorTypeBooleanSwitch title:NSLocalizedString(@"_autoupload_", nil)];
     
@@ -256,7 +256,7 @@
                 
             if(isLocationIsEnabled == YES) {
                     
-                UIAlertView * alertView = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"_autoupload_background_title_", nil) message:[CCUtility localizableBrand:@"_autoupload_background_msg_" table:nil] delegate:nil cancelButtonTitle:nil otherButtonTitles:NSLocalizedString(@"_ok_", nil), nil];
+                UIAlertView * alertView = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"_autoupload_background_title_", nil) message:NSLocalizedString(@"_autoupload_background_msg_", nil) delegate:nil cancelButtonTitle:nil otherButtonTitles:NSLocalizedString(@"_ok_", nil), nil];
                 [alertView show];
                     
                 [[NCManageDatabase sharedInstance] setAccountAutoUploadFiled:@"autoUploadBackground" state:YES];
@@ -446,18 +446,18 @@
     switch (section)
     {
         case 0:
-            sectionName = [CCUtility localizableBrand:@"_photo_folder_photocamera_" table:nil];
+            sectionName = NSLocalizedString(@"_autoupload_description_", nil);
             break;
         case 3:
-            if (tableAccount.autoUpload) sectionName = [CCUtility localizableBrand:@"_photo_folder_background_" table:nil];
+            if (tableAccount.autoUpload) sectionName = NSLocalizedString(@"_autoupload_description_background_", nil);
             else sectionName = @"";
             break;
         case 4:
-            if (tableAccount.autoUpload) sectionName =  [CCUtility localizableBrand:@"_autoupload_fullphotos_footer_" table:nil];
+            if (tableAccount.autoUpload) sectionName =  NSLocalizedString(@"_autoupload_fullphotos_footer_", nil);
             else sectionName = @"";
             break;
         case 5:
-            if (tableAccount.autoUpload) sectionName =  [CCUtility localizableBrand:@"_autoupload_create_subfolder_footer_" table:nil];
+            if (tableAccount.autoUpload) sectionName =  NSLocalizedString(@"_autoupload_create_subfolder_footer_", nil);
             else sectionName = @"";
             break;
     }

iOSClient/Supporting Files/en.lproj/Intro.strings

@@ -12,7 +12,7 @@
 "_intro_1_text_"    = "Access, share and protect your files at home and in your enterprise";
 
 "_intro_2_title_"   = "Multi account";
-"_intro_2_text_"    = "Connect to all your clouds and touch _brand_ logo to quickly switch";
+"_intro_2_text_"    = "Connect to all your clouds and touch Nextcloud logo on Files tab to quickly switch";
 
 "_intro_3_title_"   = "Start";
-"_intro_3_text_"    = "Good, you’re now ready to start using your _brand_. We remind you that you can find further information and news or contact us on the site: \n\n https://nextcloud.com \n\n Come and visit us!";
+"_intro_3_text_"    = "Good, you’re now ready to start using your Nextcloud. We remind you that you can find further information and news or contact us on the site: \n\n https://nextcloud.com \n\n Come and visit us!";

iOSClient/Supporting Files/en.lproj/Localizable.strings

@@ -35,7 +35,7 @@
 "_no_"                      = "No";
 "_yes_"                     = "Yes";
 "_select_"                  = "Select";
-"_crypto_cloud_upload_"     = "_brand_ - Upload";
+"_crypto_cloud_upload_"     = "Upload";
 "_home_"                    = "Files";
 "_file_to_upload_"          = "File to upload";
 "_destination_"             = "Destination";
@@ -101,11 +101,11 @@
 "_contact_by_email_"        = "Contact us by email";
 "_clear_cache_"             = "Clear Cache (%@ used)";
 "_clear_cache_no_size_"     = "Clear Cache";
-"_exit_"                    = "Exit _brand_";
+"_exit_"                    = "Exit";
 "_funct_not_enabled_"       = "Functionality not enabled";
 "_passcode_activate_"       = "Password Lock activated";
 "_disabling_passcode_"      = "Disabling Password Lock";
-"_want_exit_"               = "Attention! _brand_ will be reset to the initial state. Continue?";
+"_want_exit_"               = "Attention!  Will be reset all to the initial state. Continue?";
 "_proceed_"                 = "Proceed";
 "_delete_cache_"            = "Delete cache";
 "_want_delete_cache_"       = "Do you want to delete cache?";
@@ -128,7 +128,7 @@
 "_version_server_"          = "Server version";
 "_check_key_aes_256_"       = "Manage encryption key passcode";
 "_encryptpass_by_email_"    = "Send by email";
-"_title_mail_encryptpass_"  = "Encryption Key Passcode _brand_";
+"_title_mail_encryptpass_"  = "Encryption Key Passcode Nextcloud";
 "_text1_mail_encryptpass_"  = "Your encryption key passcode is";
 "_text2_mail_encryptpass_"  = "store it securely and away from prying eyes.";
 "_help_"                    = "Help";
@@ -156,17 +156,16 @@
 "_autoupload_background_"       = "Auto upload in the background";
 "_autoupload_photos_"           = "Auto upload photos";
 "_autoupload_videos_"           = "Auto upload videos";
-"_photo_folder_photocamera_"    = "The news photos/videos will be uploaded in your Cloud";
-"_photo_folder_background_"     = "This option requires the use of GPS to trigger the detection of new photos/videos in the camera roll once the location changes significantly";
+"_autoupload_description_"      = "The news photos/videos will be uploaded in your Cloud";
+"_autoupload_description_background_"  = "This option requires the use of GPS to trigger the detection of new photos/videos in the camera roll once the location changes significantly";
 "_autoupload_background_title_" = "Limitations";
-"_autoupload_background_msg_"   = "Due to IOS restrictions, it is not yet possible to perform background processes, unless GPS services are activated. Once the cell in the cellular network is changed, the system wakes up _brand_ for a short time and checks for new photos to upload to the cloud.";
+"_autoupload_background_msg_"   = "Due to IOS restrictions, it is not yet possible to perform background processes, unless GPS services are activated. Once the cell in the cellular network is changed, the system wakes up for a short time and checks for new photos to upload to the cloud.";
 "_autoupload_change_location_"  = "Change folder";
 "_autoupload_location_now_"     = "Folder";
 "_autoupload_location_default_" = "Restore default folder";
 "_autoupload_change_location_footer_" = "Change Photos folder that is used for 'Automatic upload of camera photos' (if the option is enabled)";
 "_autoupload_not_select_home_"  = "Select a folder";
 "_autoupload_save_album_"       = "Copy photo or video in the photo album";
-"_autoupload_save_album_footer_" = "After the automatic sending of the photo or video, a copy is saved in the photo album : _brand_ (does not require more space in the camera roll)";
 "_autoupload_fullphotos_"        = "Upload all camera roll";
 "_autoupload_fullphotos_footer_" = "Select the options above before uploading";
 "_autoupload_create_subfolder_" = "Use subfolders";
@@ -184,7 +183,7 @@
 // Manage Help
 
 "_help_tutorial_"               = "Tutorial";
-"_help_intro_"                  = "Introduction _brand_";
+"_help_intro_"                  = "Introduction Nextcloud";
 "_help_activity_verbose_"       = "Detailed Activity feed";
 "_help_activity_mail_"          = "Send activity by mail";
 "_help_activity_clear_"         = "Clear activity";
@@ -195,7 +194,7 @@
 "_optimized_photos_"            = "Optimized photos resolution";
 "_upload_del_photos_"           = "Remove files after upload";
 "_optimized_photos_how_"        = "If your iPhone is low on space, full-resolution photos are automatically replaced with optimized versions. The full-resolution versions are stored in your Cloud.";
-"_upload_del_photos_how_"       = "Files will be removed from _brand_ memory after they’ve been uploaded to the Cloud. They will remain in the camera roll. Just download the files to see them.";
+"_upload_del_photos_how_"       = "Files will be removed from device memory after they’ve been uploaded to the Cloud. They will remain in the camera roll. Just download the files to see them.";
 
 // Login
 

iOSClient/UploadFromOtherUpp/CCUploadFromOtherUpp.m

@@ -39,7 +39,7 @@
     [super viewDidLoad];
     
     self.navigationItem.rightBarButtonItem.title = NSLocalizedString(@"_cancel_", nil);
-    self.title = [CCUtility localizableBrand:@"_crypto_cloud_upload_" table:nil];
+    self.title = NSLocalizedString(@"_crypto_cloud_upload_", nil);
     
     serverUrlLocal= [CCUtility getHomeServerUrlActiveUrl:app.activeUrl];
     destinationTitle = NSLocalizedString(@"_home_", nil);

iOSClient/Utility/CCUtility.h

@@ -161,8 +161,6 @@
 
 + (void)sendMailEncryptPass:(NSString *)recipient validateEmail:(BOOL)validateEmail form:(id)form nameImage:(NSString *)nameImage;
 
-+ (NSString *)localizableBrand:(NSString *)localize table:(NSString *)table;
-
 + (NSArray *)createNameSubFolder:(NSArray *)assets;
 
 // ===== CCMetadata =====

iOSClient/Utility/CCUtility.m

@@ -709,7 +709,7 @@
         MFMailComposeViewController *mc = [[MFMailComposeViewController alloc] init];
         mc.mailComposeDelegate = form;
         
-        [mc setSubject:[self localizableBrand:@"_title_mail_encryptpass_" table:nil]];
+        [mc setSubject:NSLocalizedString(@"_title_mail_encryptpass_", nil)];
         
         NSString *htmlMsg =[NSString stringWithFormat:@"<html><body><p>%@ : %@ , %@</p></body></html>", NSLocalizedString(@"_text1_mail_encryptpass_", nil), key, NSLocalizedString(@"_text2_mail_encryptpass_", nil)];
         
@@ -735,21 +735,6 @@
     }
 }
 
-+ (NSString *)localizableBrand:(NSString *)localize table:(NSString *)table
-{
-    NSString *translate;
-    
-    if (table)
-        translate = NSLocalizedStringFromTable(localize, table, nil);
-    else
-        translate = NSLocalizedString(localize, nil);
-    
-    translate = [translate stringByReplacingOccurrencesOfString:@"_brand_" withString:[NCBrandOptions sharedInstance].brand];
-    translate = [translate stringByReplacingOccurrencesOfString:@"_mail_me_" withString:[NCBrandOptions sharedInstance].mailMe];
-    
-    return translate;
-}
-
 + (NSArray *)createNameSubFolder:(NSArray *)alassets
 {
     NSMutableOrderedSet *datesSubFolder = [NSMutableOrderedSet new];