- Fixes pins/unpins

- Fixles i18n

FSNotes iOS/Localizable.xcstrings

@@ -7308,7 +7308,7 @@
         "ru" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Туду"
+            "value" : "Задачи"
           }
         },
         "uk" : {

FSNotes.xcodeproj/project.pbxproj

@@ -4556,7 +4556,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 622;
+				CURRENT_PROJECT_VERSION = 623;
 				DEVELOPMENT_TEAM = 866P6MTE92;
 				EMBED_ASSET_PACKS_IN_PRODUCT_BUNDLE = YES;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -4573,7 +4573,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.14;
-				MARKETING_VERSION = 6.7.2;
+				MARKETING_VERSION = 6.7.3;
 				OTHER_SWIFT_FLAGS = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = co.fluder.FSNotes;
 				PRODUCT_NAME = FSNotes;
@@ -4596,7 +4596,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 622;
+				CURRENT_PROJECT_VERSION = 623;
 				DEPLOYMENT_LOCATION = NO;
 				DEVELOPMENT_TEAM = 866P6MTE92;
 				EMBED_ASSET_PACKS_IN_PRODUCT_BUNDLE = YES;
@@ -4614,7 +4614,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.14;
-				MARKETING_VERSION = 6.7.2;
+				MARKETING_VERSION = 6.7.3;
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = co.fluder.FSNotes;
 				PRODUCT_NAME = FSNotes;

FSNotes/Business/Markdown.swift

@@ -88,7 +88,7 @@ func renderSoulverCodeBlocks(markdown: String) -> String {
 func generateAlphabeticalString(length: Int) -> String {
     let alphabet = "abcdefghijklmnopqrstuvwxyz"
     var result = "@"
-    var length = length - 2
+    let length = length - 2
 
     for _ in 0..<length {
         let randomIndex = Int.random(in: 0..<alphabet.count)

FSNotes/Business/Note.swift

@@ -2189,4 +2189,8 @@ public class Note: NSObject  {
     public func getContentOffset() -> CGPoint {
         return contentOffset
     }
+
+    public func getRelatedPath() -> String {
+        return project.getNestedPath() + "/" + name
+    }
 }

FSNotes/Business/Project.swift

@@ -994,4 +994,29 @@ public class Project: Equatable {
             note.load()
         }
     }
+
+    public func getNestedPath() -> String {
+        var project: Project? = self
+        var result = String()
+
+        while project != nil {
+            if project?.parent == nil {
+                return result
+            }
+
+            if let unwrappedProject = project {
+                if result.count > 0 {
+                    result = unwrappedProject.label + "/" + result
+                } else {
+                    result = unwrappedProject.label
+                }
+
+                project = unwrappedProject.parent
+            } else {
+                project = nil
+            }
+        }
+
+        return result
+    }
 }

FSNotes/Business/Storage.swift

@@ -641,7 +641,17 @@ class Storage {
                 $0.title.lowercased().starts(with: startWith.lowercased())
             }
     }
-
+
+    func getByUrl(endsWith: String) -> Note? {
+        for note in noteList {
+            if note.url.path.hasSuffix(endsWith) {
+                return note
+            }
+        }
+
+        return nil
+    }
+
     func getBy(contains: String) -> [Note]? {
         return
             noteList.filter{
@@ -833,7 +843,7 @@ class Storage {
         if let pinned = getPinned() {
             var names = [String]()
             for note in pinned {
-                names.append(note.name)
+                names.append(note.getRelatedPath())
             }
 
             let keyStore = NSUbiquitousKeyValueStore()
@@ -856,7 +866,7 @@ class Storage {
             else { return }
 
         for note in notes {
-            if names.contains(note.name) {
+            if names.contains(note.getRelatedPath()) {
                 note.addPin(cloudSave: false)
                 success.append(note)
             }
@@ -876,15 +886,15 @@ class Storage {
         if let names = keyStore.array(forKey: "co.fluder.fsnotes.pins.shared") as? [String] {
             if let pinned = getPinned() {
                 for note in pinned {
-                    if !names.contains(note.name) {
+                    if !names.contains(note.getRelatedPath()) {
                         note.removePin(cloudSave: false)
                         removed.append(note)
                     }
                 }
             }
 
             for name in names {
-                if let note = getBy(name: name), !note.isPinned {
+                if let note = getByUrl(endsWith: name), !note.isPinned {
                     note.addPin(cloudSave: false)
                     added.append(note)
                 }
@@ -905,14 +915,14 @@ class Storage {
         if let names = keyStore.array(forKey: "co.fluder.fsnotes.pins.shared") as? [String] {
             if let pinned = getPinned() {
                 for note in pinned {
-                    if !names.contains(note.name) {
+                    if !names.contains(note.getRelatedPath()) {
                         notes.append(note)
                     }
                 }
             }
 
             for name in names {
-                if let note = getBy(name: name), !note.isPinned {
+                if let note = getByUrl(endsWith: name), !note.isPinned {
                     notes.append(note)
                 }
             }

FSNotes/ViewController.swift

@@ -1810,7 +1810,6 @@ class ViewController: EditorViewController,
         if let keys = notification.userInfo?[NSUbiquitousKeyValueStoreChangedKeysKey] as? [String] {
             for key in keys {
                 if key == "co.fluder.fsnotes.pins.shared" {
-
                     let changedNotes = storage.getUpdatedPins()
 
                     DispatchQueue.main.async {