Merge pull request #1812 from Eitot/feature/localisable-strings

Fix localisation warnings
ViennaRSS · Sep 13, 2024 · 79ad41e · 79ad41e
2 parents 1441e4f + 37007a7
commit 79ad41e
Show file tree

Hide file tree

Showing 10 changed files with 1,451 additions and 525 deletions.
diff --git a/Vienna/Resources/Localizable.xcstrings b/Vienna/Resources/Localizable.xcstrings
diff --git a/Vienna/Sources/Alerts/SearchPanel.m b/Vienna/Sources/Alerts/SearchPanel.m
@@ -40,7 +40,11 @@ -(void)runSearchPanel:(NSWindow *)window
 		self.topObjects = objects;
 		((NSSearchFieldCell *)searchField.cell).searchMenuTemplate = APPCONTROLLER.searchFieldMenu;
 	}
-	[searchLabel setStringValue:NSLocalizedString(@"Search", @"Search panel title")];
+	searchLabel.stringValue = NSLocalizedStringWithDefaultValue(@"search.window",
+																nil,
+																NSBundle.mainBundle,
+																@"Search",
+																@"Window title");
 	searchField.stringValue = APPCONTROLLER.searchString ? APPCONTROLLER.searchString : @"";
     [window beginSheet:searchPanelWindow completionHandler:nil];
 }

diff --git a/Vienna/Sources/Application/AppController.m b/Vienna/Sources/Application/AppController.m
@@ -402,7 +402,11 @@ - (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sende
         alert.messageText = NSLocalizedString(@"One or more downloads are in progress", @"Message text of an alert");
         alert.informativeText = NSLocalizedString(@"If you quit Vienna now, all downloads will stop.", @"Message text of an alert");
         [alert addButtonWithTitle:NSLocalizedString(@"Quit", @"Title of a button on an alert")];
-        [alert addButtonWithTitle:NSLocalizedString(@"Cancel", @"Title of a button on an alert")];
+        [alert addButtonWithTitle:NSLocalizedStringWithDefaultValue(@"cancel.button",
+                                                                    nil,
+                                                                    NSBundle.mainBundle,
+                                                                    @"Cancel",
+                                                                    @"Title of a button on an alert")];
         NSModalResponse alertResponse = [alert runModal];
 
         if (alertResponse == NSAlertSecondButtonReturn) {
@@ -557,7 +561,11 @@ -(BOOL)application:(NSApplication *)theApplication openFile:(NSString *)filename
         alert.messageText = NSLocalizedString(@"Import subscriptions from OPML file?", nil);
         alert.informativeText = NSLocalizedString(@"Do you really want to import the subscriptions from the specified OPML file?", nil);
         [alert addButtonWithTitle:NSLocalizedString(@"Import", @"Title of a button on an alert")];
-        [alert addButtonWithTitle:NSLocalizedString(@"Cancel", @"Title of a button on an alert")];
+        [alert addButtonWithTitle:NSLocalizedStringWithDefaultValue(@"cancel.button",
+                                                                    nil,
+                                                                    NSBundle.mainBundle,
+                                                                    @"Cancel",
+                                                                    @"Title of a button on an alert")];
         NSModalResponse alertResponse = [alert runModal];
 
         if (alertResponse == NSAlertFirstButtonReturn) {
@@ -1395,7 +1403,11 @@ -(IBAction)emptyTrash:(id)sender
     alert.messageText = NSLocalizedString(@"Are you sure you want to delete the messages in the Trash folder permanently?", nil);
     alert.informativeText = NSLocalizedString(@"You cannot undo this action", nil);
     [alert addButtonWithTitle:NSLocalizedString(@"Empty", @"Title of a button on an alert")];
-    [alert addButtonWithTitle:NSLocalizedString(@"Cancel", @"Title of a button on an alert")];
+    [alert addButtonWithTitle:NSLocalizedStringWithDefaultValue(@"cancel.button",
+                                                                nil,
+                                                                NSBundle.mainBundle,
+                                                                @"Cancel",
+                                                                @"Title of a button on an alert")];
     [alert beginSheetModalForWindow:self.mainWindow completionHandler:^(NSModalResponse returnCode) {
         if (returnCode == NSAlertFirstButtonReturn) {
             [self clearUndoStack];
@@ -1501,7 +1513,11 @@ -(void)showAppInStatusBar
 								 action:@selector(markAllSubscriptionsRead:)
 						  keyEquivalent:@""];
         [statusBarMenu addItem:[NSMenuItem separatorItem]];
-        [statusBarMenu addItemWithTitle:NSLocalizedString(@"Quit Vienna", @"Title of a menu item")
+        [statusBarMenu addItemWithTitle:NSLocalizedStringWithDefaultValue(@"quitVienna.menuItem",
+                                                                          nil,
+                                                                          NSBundle.mainBundle,
+                                                                          @"Quit Vienna",
+                                                                          @"Title of a menu item")
                                  action:@selector(terminate:)
                           keyEquivalent:@""];
 		appStatusItem.menu = statusBarMenu;
@@ -2203,8 +2219,16 @@ -(IBAction)deleteMessage:(id)sender
             NSAlert *alert = [NSAlert new];
             alert.messageText = NSLocalizedString(@"Are you sure you want to permanently delete the selected articles?", nil);
             alert.informativeText = NSLocalizedString(@"This operation cannot be undone.", nil);
-            [alert addButtonWithTitle:NSLocalizedString(@"Delete", @"Title of a button on an alert")];
-            [alert addButtonWithTitle:NSLocalizedString(@"Cancel", @"Title of a button on an alert")];
+            [alert addButtonWithTitle:NSLocalizedStringWithDefaultValue(@"delete.button",
+                                                                        nil,
+                                                                        NSBundle.mainBundle,
+                                                                        @"Delete",
+                                                                        @"Title of a button on an alert")];
+            [alert addButtonWithTitle:NSLocalizedStringWithDefaultValue(@"cancel.button",
+                                                                        nil,
+                                                                        NSBundle.mainBundle,
+                                                                        @"Cancel",
+                                                                        @"Title of a button on an alert")];
             [alert beginSheetModalForWindow:self.mainWindow completionHandler:^(NSModalResponse returnCode) {
                 if (returnCode == NSAlertFirstButtonReturn) {
                     NSArray *articleArray = self.articleController.markedArticleRange;
@@ -2406,8 +2430,16 @@ -(IBAction)deleteFolder:(id)sender
         NSAlert *alert = [NSAlert new];
         alert.messageText = alertTitle;
         alert.informativeText = alertBody;
-        [alert addButtonWithTitle:NSLocalizedString(@"Delete", @"Title of a button on an alert")];
-        [alert addButtonWithTitle:NSLocalizedString(@"Cancel", @"Title of a button on an alert")];
+        [alert addButtonWithTitle:NSLocalizedStringWithDefaultValue(@"delete.button",
+                                                                    nil,
+                                                                    NSBundle.mainBundle,
+                                                                    @"Delete",
+                                                                    @"Title of a button on an alert")];
+        [alert addButtonWithTitle:NSLocalizedStringWithDefaultValue(@"cancel.button",
+                                                                    nil,
+                                                                    NSBundle.mainBundle,
+                                                                    @"Cancel",
+                                                                    @"Title of a button on an alert")];
         NSModalResponse alertResponse = [alert runModal];
 
 		if (alertResponse == NSAlertSecondButtonReturn) {
@@ -3217,7 +3249,11 @@ -(BOOL)validateMenuItem:(NSMenuItem *)menuItem
 	} else if (theAction == @selector(deleteFolder:)) {
 		Folder * folder = [db folderFromID:self.foldersTree.actualSelection];
 		if (folder.type == VNAFolderTypeSearch) {
-			[menuItem setTitle:NSLocalizedString(@"Delete", @"Title of a menu item")];
+			menuItem.title = NSLocalizedStringWithDefaultValue(@"delete.menuItem",
+															   nil,
+															   NSBundle.mainBundle,
+															   @"Delete",
+															   @"Title of a menu item");
 		} else {
 			[menuItem setTitle:NSLocalizedString(@"Delete…", @"Title of a menu item")];
 		}

diff --git a/Vienna/Sources/Database/Database.m b/Vienna/Sources/Database/Database.m
@@ -137,7 +137,11 @@ - (BOOL)initialiseDatabase {
                  @"Vienna may not work as expected if the database is corrupted. We recommend you quit Vienna and either restore the database (%@) from a backup or attempt a sqlite3 recovery.",
                  @"Informative text of an alert"),
              self.databaseQueue.path.lastPathComponent];
-        [alert addButtonWithTitle:NSLocalizedString(@"Quit Vienna", @"Button to quit Vienna after a database check")];
+        [alert addButtonWithTitle:NSLocalizedStringWithDefaultValue(@"quitVienna.button",
+                                                                    nil,
+                                                                    NSBundle.mainBundle,
+                                                                    @"Quit Vienna",
+                                                                    @"Button to quit Vienna after a database check")];
         [alert addButtonWithTitle:NSLocalizedString(@"Continue Anyway",
                                                     @"Button to continue running Vienna despite an unsuccessful check")];
         NSInteger modalReturn = [alert runModal];
@@ -160,7 +164,11 @@ - (BOOL)initialiseDatabase {
         [alert setMessageText:NSLocalizedString(@"Database Upgrade", nil)];
         [alert setInformativeText:NSLocalizedString(@"Vienna must upgrade its database to the latest version. This may take a minute or so. We apologize for the inconvenience.", nil)];
         [alert addButtonWithTitle:NSLocalizedString(@"Upgrade Database", @"Title of a button on an alert")];
-        [alert addButtonWithTitle:NSLocalizedString(@"Quit Vienna", @"Button to quit Vienna after a database check")];
+        [alert addButtonWithTitle:NSLocalizedStringWithDefaultValue(@"quitVienna.button",
+                                                                    nil,
+                                                                    NSBundle.mainBundle,
+                                                                    @"Quit Vienna",
+                                                                    @"Button to quit Vienna after a database check")];
         NSInteger modalReturn = [alert runModal];
         if (modalReturn == NSAlertSecondButtonReturn) {
             return NO;
@@ -376,7 +384,11 @@ -(NSString *)relocateLockedDatabase:(NSString *)path
     alert.messageText = NSLocalizedString(@"Cannot create the Vienna database", nil);
     alert.informativeText = [NSString stringWithFormat:NSLocalizedString(@"A new Vienna database cannot be created at \"%@\" because the folder is probably located on a remote network share and this version of Vienna cannot manage remote databases. Please choose an alternative folder that is located on your local machine.", nil), path];
     [alert addButtonWithTitle:NSLocalizedString(@"Locate…", @"Title of a button on an alert")];
-    [alert addButtonWithTitle:NSLocalizedString(@"Cancel", @"Title of a button on an alert")];
+    [alert addButtonWithTitle:NSLocalizedStringWithDefaultValue(@"cancel.button",
+                                                                nil,
+                                                                NSBundle.mainBundle,
+                                                                @"Cancel",
+                                                                @"Title of a button on an alert")];
     NSModalResponse alertResponse = [alert runModal];
 
     // When the cancel button is pressed.

diff --git a/Vienna/Sources/Download window/DownloadWindow.m b/Vienna/Sources/Download window/DownloadWindow.m
@@ -95,7 +95,13 @@ -(void)windowDidLoad
 	[downloadMenu addItemWithTitle:NSLocalizedString(@"Remove From List", @"Title of a popup menu item") action:@selector(removeFromList:) keyEquivalent:@""];
 
 	// Cancel
-	[downloadMenu addItemWithTitle:NSLocalizedString(@"Cancel", @"Title of a popup menu item") action:@selector(cancelDownload:) keyEquivalent:@""];
+	[downloadMenu addItemWithTitle:NSLocalizedStringWithDefaultValue(@"cancel.menuItem",
+																	 nil,
+																	 NSBundle.mainBundle,
+																	 @"Cancel",
+																	 @"Title of a menu item")
+							action:@selector(cancelDownload:)
+					 keyEquivalent:@""];
 
 	[downloadMenu setDelegate:self];
 	table.menu = downloadMenu;

diff --git a/Vienna/Sources/Download window/NSWorkspace+OpenWithMenu.m b/Vienna/Sources/Download window/NSWorkspace+OpenWithMenu.m
@@ -124,7 +124,7 @@ - (NSMenu *)vna_openWithMenuForFile:(NSString *)path target:(id)t action:(SEL)s
         [submenu addItem:[NSMenuItem separatorItem]];
     }
 
-    NSString *title = NSLocalizedString(@"Select…", @"Title of a popup menu item");
+    NSString *title = NSLocalizedString(@"Select…", @"Title of a menu item");
     NSMenuItem *selectItem = [submenu addItemWithTitle:title action:selector keyEquivalent:@""];
     [selectItem setTag:1];
     [selectItem setTarget:target];

diff --git a/Vienna/Sources/Main window/ArticleController.m b/Vienna/Sources/Main window/ArticleController.m
@@ -573,7 +573,11 @@ -(void)markDeletedByArray:(NSArray *)articleArray deleteFlag:(BOOL)deleteFlag
 	NSUndoManager * undoManager = NSApp.mainWindow.undoManager;
 	SEL markDeletedUndoAction = deleteFlag ? @selector(markDeletedUndo:) : @selector(markUndeletedUndo:);
 	[undoManager registerUndoWithTarget:self selector:markDeletedUndoAction object:articleArray];
-	[undoManager setActionName:NSLocalizedString(@"Delete", nil)];
+    [undoManager setActionName:NSLocalizedStringWithDefaultValue(@"delete.undoAction",
+                                                                 nil,
+                                                                 NSBundle.mainBundle,
+                                                                 @"Delete",
+                                                                 @"Name of an undo/redo action in the menu bar's Edit menu.")];
 
 	// We will make a new copy of currentArrayOfArticles and folderArrayOfArticles with the selected articles removed.
 	NSMutableArray * currentArrayCopy = [NSMutableArray arrayWithArray:currentArrayOfArticles];
@@ -782,7 +786,11 @@ -(void)markReadByArray:(NSArray *)articleArray readFlag:(BOOL)readFlag
 	NSUndoManager * undoManager = NSApp.mainWindow.undoManager;	
 	SEL markReadUndoAction = readFlag ? @selector(markUnreadUndo:) : @selector(markReadUndo:);
 	[undoManager registerUndoWithTarget:self selector:markReadUndoAction object:articleArray];
-	[undoManager setActionName:NSLocalizedString(@"Mark Read", nil)];
+	[undoManager setActionName:NSLocalizedStringWithDefaultValue(@"markRead.undoAction",
+																 nil,
+																 NSBundle.mainBundle,
+																 @"Mark Read",
+																 @"Name of an undo/redo action in the menu bar's Edit menu.")];
 
     [self innerMarkReadByArray:articleArray readFlag:readFlag];
 

diff --git a/Vienna/Sources/Main window/ArticleListView.m b/Vienna/Sources/Main window/ArticleListView.m
@@ -251,7 +251,11 @@ -(void)initTableView
 
 	NSMenu *articleListMenu = [[NSMenu alloc] init];
 
-	[articleListMenu addItemWithTitle:NSLocalizedString(@"Mark Read", @"Title of a menu item")
+	[articleListMenu addItemWithTitle:NSLocalizedStringWithDefaultValue(@"markRead.menuItem",
+																		nil,
+																		NSBundle.mainBundle,
+																		@"Mark Read",
+																		@"Title of a menu item")
 							   action:@selector(markRead:)
 						keyEquivalent:@""];
 	[articleListMenu addItemWithTitle:NSLocalizedString(@"Mark Unread", @"Title of a menu item")

diff --git a/Vienna/Sources/Main window/MainWindowController.swift b/Vienna/Sources/Main window/MainWindowController.swift
@@ -364,9 +364,18 @@ extension MainWindowController: NSToolbarDelegate {
                 toolbarSearchField = item.view as? NSSearchField
             }
 
-            item.label = NSLocalizedString("Search", comment: "Toolbar item label")
-            item.paletteLabel = NSLocalizedString("Search", comment: "Toolbar item palette label")
-            item.toolTip = NSLocalizedString("Search", comment: "Toolbar item tooltip")
+            item.label = NSLocalizedString(
+                "search.toolbarItem.label",
+                value: "Search",
+                comment: "Toolbar item label")
+            item.paletteLabel = NSLocalizedString(
+                "search.toolbarItem.paletteLabel",
+                value: "Search",
+                comment: "Toolbar item palette label")
+            item.toolTip = NSLocalizedString(
+                "search.toolbarItem.toolTip",
+                value: "Search",
+                comment: "Toolbar item tooltip")
 
             item.action = #selector(AppController.searchUsingToolbarTextField(_:))
             item.menuFormRepresentation = NSMenuItem(title: item.label, action: item.action, keyEquivalent: "")
@@ -382,8 +391,14 @@ extension MainWindowController: NSToolbarDelegate {
                 return nil
             }
             let item = toolbarItem(forSharingService: service, identifier: .email)
-            item.label = NSLocalizedString("Email Link", comment: "Toolbar item label")
-            item.paletteLabel = NSLocalizedString("Email Link", comment: "Toolbar item palette label")
+            item.label = NSLocalizedString(
+                "emailLink.toolbarItem.label",
+                value: "Email Link",
+                comment: "Toolbar item label")
+            item.paletteLabel = NSLocalizedString(
+                "emailLink.toolbarItem.paletteLabel",
+                value: "Email Link",
+                comment: "Toolbar item palette label")
             item.toolTip = NSLocalizedString(
                 "Email a link to the current article or website",
                 comment: "Toolbar item tooltip")

diff --git a/Vienna/Sources/Main window/UnifiedDisplayView.m b/Vienna/Sources/Main window/UnifiedDisplayView.m
@@ -102,7 +102,11 @@ -(void)initTableView
 
 	NSMenu * articleListMenu = [[NSMenu alloc] init];
 
-	[articleListMenu addItemWithTitle:NSLocalizedString(@"Mark Read", @"Title of a menu item")
+	[articleListMenu addItemWithTitle:NSLocalizedStringWithDefaultValue(@"markRead.menuItem",
+																		nil,
+																		NSBundle.mainBundle,
+																		@"Mark Read",
+																		@"Title of a menu item")
 							   action:@selector(markRead:)
 						keyEquivalent:@""];
 	[articleListMenu addItemWithTitle:NSLocalizedString(@"Mark Unread", @"Title of a menu item")