Merge pull request #1163 from anyproto/ios-2631-rename-links-tofrom-t…

…o-linksbacklinks iOS-2631 Rename links to/from to links/backlinks
anyproto · Apr 9, 2024 · 3671d2a · 3671d2a
2 parents 5713116 + e3c6ba3
commit 3671d2a
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 12 deletions.
diff --git a/Anytype/Generated/Strings.swift b/Anytype/Generated/Strings.swift
@@ -80,6 +80,10 @@ internal enum Loc {
   internal static let background = Loc.tr("Localizable", "Background", fallback: "Background")
   /// Background picture
   internal static let backgroundPicture = Loc.tr("Localizable", "Background picture", fallback: "Background picture")
+  /// Plural format key: "%#@object@"
+  internal static func backlinksCount(_ p1: Int) -> String {
+    return Loc.tr("Localizable", "Backlinks count", p1, fallback: "Plural format key: \"%#@object@\"")
+  }
   /// Basic
   internal static let basic = Loc.tr("Localizable", "Basic", fallback: "Basic")
   /// Bin
@@ -1778,14 +1782,6 @@ internal enum Loc {
       /// TXT
       internal static let text = Loc.tr("Localizable", "Relation.ImportType.Text", fallback: "TXT")
     }
-    internal enum LinksFrom {
-      /// from
-      internal static let title = Loc.tr("Localizable", "Relation.LinksFrom.Title", fallback: "from")
-    }
-    internal enum LinksTo {
-      /// to
-      internal static let title = Loc.tr("Localizable", "Relation.LinksTo.Title", fallback: "to")
-    }
     internal enum Object {
       internal enum Delete {
         internal enum Alert {

diff --git a/Anytype/Resources/Strings/en.lproj/Localizable.strings b/Anytype/Resources/Strings/en.lproj/Localizable.strings
@@ -76,8 +76,6 @@
 "Relation.AddedToLibrary" = "Relation ‘%@’ added to your library";
 "Relation.Deleted" = "Deleted relation";
 "Relation.From.Type" = "From type %@";
-"Relation.LinksFrom.Title" = "from";
-"Relation.LinksTo.Title" = "to";
 "Relation.EmptyState.title" = "No options";
 "Relation.EmptyState.description" = "Nothing found. Create first option to start.";
 "Relation.EmptyState.Blocked.title" = "The relation is empty";

diff --git a/Anytype/Resources/Strings/en.lproj/Localizable.stringsdict b/Anytype/Resources/Strings/en.lproj/Localizable.stringsdict
@@ -66,6 +66,22 @@
 			<string>%d links</string>
 		</dict>
 	</dict>
+	<key>Backlinks count</key>
+	<dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@object@</string>
+		<key>object</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string>%d backlink</string>
+			<key>other</key>
+			<string>%d backlinks</string>
+		</dict>
+	</dict>
 	<key>Days to deletion account</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>

diff --git a/Anytype/Sources/Models/Relations/Entities/RelationValue/RelationObject.swift b/Anytype/Sources/Models/Relations/Entities/RelationValue/RelationObject.swift
@@ -53,9 +53,9 @@ extension Relation.Object {
         func title(with count: Int) -> String {
             switch self {
             case .links:
-                return Loc.linksCount(count) + " " + Loc.Relation.LinksFrom.title
+                return Loc.linksCount(count)
             case .backlinks:
-                return Loc.linksCount(count) + " " + Loc.Relation.LinksTo.title
+                return Loc.backlinksCount(count)
             }
         }
     }