Support for multiple localized strings

Author: florian-agsteiner-caperwhite

LocalizationEditor.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

LocalizationEditor/AppDelegate.swift

@@ -12,6 +12,7 @@ import Cocoa
 @NSApplicationMain
 class AppDelegate: NSObject, NSApplicationDelegate {
     @IBOutlet weak var openFolderMenuItem: NSMenuItem!
+    @IBOutlet weak var selectMenuItem: NSMenuItem!
 
     func applicationDidFinishLaunching(_: Notification) {
         setupLogging()

LocalizationEditor/Providers/LocalizationsDataSource.swift

@@ -13,30 +13,45 @@ class LocalizationsDataSource: NSObject, NSTableViewDataSource {
 
     // MARK: - Properties
 
-    private var localizationGroup: LocalizationGroup? = nil
+    private var localizationGroups: [LocalizationGroup] = []
+    private var selectedLocalizationGroup: LocalizationGroup? = nil
     private var localizations: [Localization] = []
     private var masterLocalization: Localization?
     private let localizationProvider = LocalizationProvider()
     private var numberOfKeys = 0
 
     // MARK: - Action
 
-    func load(folder: URL, onCompletion: @escaping ([String]) -> Void) {
+    func load(folder: URL, onCompletion: @escaping ([String], String?, [LocalizationGroup]) -> Void) {
         DispatchQueue.global(qos: .background).async {
 
-            self.localizationGroup = self.localizationProvider.getLocalizations(url: folder).filter({$0.name == "Localizable.strings" }).first
-            self.localizations = self.localizationGroup?.localizations ?? []
-            self.numberOfKeys = self.localizations.map({ $0.translations.count }).max() ?? 0
-            self.masterLocalization = self.localizations.first(where: { $0.translations.count == self.numberOfKeys })
-
-            DispatchQueue.main.async {
-                onCompletion(self.localizations.map({ $0.language }))
+            self.localizationGroups = self.localizationProvider.getLocalizations(url: folder)
+            if let group = self.localizationGroups.filter({$0.name == "Localizable.strings" }).first ?? self.localizationGroups.first {
+                let languages = self.select(group: group)
+                
+                DispatchQueue.main.async {
+                    onCompletion(languages, self.selectedLocalizationGroup?.name, self.localizationGroups)
+                }
             }
         }
     }
+    
+    func select(name: String) -> [String]{
+        let group = self.localizationGroups.filter({$0.name == name}).first!
+        return select(group: group)
+    }
+    
+    func select(group: LocalizationGroup) -> [String]{
+        self.selectedLocalizationGroup = group
+        self.localizations = self.selectedLocalizationGroup?.localizations ?? []
+        self.numberOfKeys = self.localizations.map({ $0.translations.count }).max() ?? 0
+        self.masterLocalization = self.localizations.first(where: { $0.translations.count == self.numberOfKeys })
+        
+        return self.localizations.map({ $0.language })
+    }
 
     func getKey(row: Int) -> String? {
-        return masterLocalization?.translations[row].key
+        return (row < masterLocalization?.translations.count ?? 0) ? masterLocalization?.translations[row].key : nil
     }
 
     func getLocalization(language: String, row: Int) -> LocalizationString {

LocalizationEditor/UI/Base.lproj/Main.storyboard

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="14113" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="13771"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14113"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -62,6 +62,16 @@
                                     </items>
                                 </menu>
                             </menuItem>
+                            <menuItem title="Select" id="3lY-JD-VuH">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <menu key="submenu" title="Select" id="mcz-dt-iwt">
+                                    <items>
+                                        <menuItem title="Item" id="rhJ-Q3-oPZ">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                        </menuItem>
+                                    </items>
+                                </menu>
+                            </menuItem>
                         </items>
                     </menu>
                     <connections>
@@ -71,6 +81,7 @@
                 <customObject id="Voe-Tx-rLC" customClass="AppDelegate" customModule="LocalizationEditor" customModuleProvider="target">
                     <connections>
                         <outlet property="openFolderMenuItem" destination="pXV-BH-hD6" id="9EJ-PN-yBL"/>
+                        <outlet property="selectMenuItem" destination="3lY-JD-VuH" id="vyY-or-HeH"/>
                     </connections>
                 </customObject>
                 <customObject id="YLy-65-1bz" customClass="NSFontManager"/>

LocalizationEditor/UI/ViewController.swift

@@ -31,6 +31,8 @@ class ViewController: NSViewController {
     private func setupMenu() {
         let appDelegate = NSApplication.shared.delegate as! AppDelegate
         appDelegate.openFolderMenuItem.action = #selector(ViewController.openAction(sender:))
+        appDelegate.selectMenuItem.isHidden = true
+        appDelegate.selectMenuItem.submenu?.removeAllItems();
     }
 
     private func setupData() {
@@ -43,8 +45,18 @@ class ViewController: NSViewController {
         tableView.delegate = self
         tableView.dataSource = dataSource
     }
+    
+    private func setupSetupLocalizsationSelectionMenu(files: [LocalizationGroup]){
+        let appDelegate = NSApplication.shared.delegate as! AppDelegate
+        appDelegate.selectMenuItem.isHidden = false
+        
+        files.map({NSMenuItem(title: $0.name, action: #selector(ViewController.selectAction(sender:)), keyEquivalent: "")}).forEach({appDelegate.selectMenuItem.submenu?.addItem($0)})
+    }
+
+    private func reloadData(with languages: [String], title: String?) {
+        let prefix = "LocalizationEditor"
+        self.view.window?.title = title.flatMap({"\(prefix) [\($0)]"}) ?? prefix // TODO
 
-    private func reloadData(with languages: [String]) {
         let columns = tableView.tableColumns
         columns.forEach {
             self.tableView.removeTableColumn($0)
@@ -73,6 +85,13 @@ class ViewController: NSViewController {
         }
         return string
     }
+    
+    @objc func selectAction(sender: NSMenuItem) {
+        let title = sender.title
+        let languages = self.dataSource.select(name: title)
+
+        self.reloadData(with: languages, title:title)
+    }
 
     @objc func openAction(sender _: NSMenuItem) {
         let openPanel = NSOpenPanel()
@@ -84,9 +103,12 @@ class ViewController: NSViewController {
             if result.rawValue == NSApplication.ModalResponse.OK.rawValue {
                 if let url = openPanel.url {
                     self.progressIndicator.startAnimation(self)
-                    self.dataSource.load(folder: url) { [unowned self] languages in
-                        self.reloadData(with: languages)
+                    self.dataSource.load(folder: url) { [unowned self] languages, title, localizationFiles in
+                        self.reloadData(with: languages, title:title)
                         self.progressIndicator.stopAnimation(self)
+                        if(localizationFiles.count > 1){
+                            self.setupSetupLocalizsationSelectionMenu(files: localizationFiles)
+                        }
                     }
                 }
             }
@@ -112,7 +134,7 @@ extension ViewController: NSTableViewDelegate {
             let cell = tableView.makeView(withIdentifier: NSUserInterfaceItemIdentifier(rawValue: LocalizationCell.identifier), owner: self)! as! LocalizationCell
             cell.delegate = self
             cell.language = language
-            cell.value = dataSource.getLocalization(language: language, row: row)
+            cell.value = row < dataSource.numberOfRows(in: tableView) ? dataSource.getLocalization(language: language, row: row) : nil
             return cell
         }
     }