Добавил локализацию для слова "Вчера" (#294)

easydev991 · web-flow · commit 59b501357de1 · 2025-03-03T09:34:41.000+03:00
diff --git a/SwiftUI-WorkoutApp.xcodeproj/project.pbxproj b/SwiftUI-WorkoutApp.xcodeproj/project.pbxproj
@@ -879,7 +879,7 @@
 				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CLANG_WARN_SEMICOLON_BEFORE_METHOD_BODY = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 5;
 				DEVELOPMENT_ASSET_PATHS = "SwiftUI-WorkoutApp/Preview\\ Content/PreviewContent.swift SwiftUI-WorkoutApp/Preview\\ Content";
 				DEVELOPMENT_TEAM = CR68PP2Z3F;
 				ENABLE_PREVIEWS = YES;
@@ -932,7 +932,7 @@
 				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CLANG_WARN_SEMICOLON_BEFORE_METHOD_BODY = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 5;
 				DEVELOPMENT_ASSET_PATHS = "SwiftUI-WorkoutApp/Preview\\ Content/PreviewContent.swift SwiftUI-WorkoutApp/Preview\\ Content";
 				DEVELOPMENT_TEAM = CR68PP2Z3F;
 				ENABLE_PREVIEWS = YES;
diff --git a/SwiftUI-WorkoutApp/Libraries/SWUtils/Sources/SWUtils/DateFormatter/DateFormatterService.swift b/SwiftUI-WorkoutApp/Libraries/SWUtils/Sources/SWUtils/DateFormatter/DateFormatterService.swift
@@ -16,7 +16,8 @@ public enum DateFormatterService {
                 showTimeInThisYear: showTimeInThisYear
             )
             formatter.dateFormat = dateFormat
-            return prefix + formatter.string(from: fullDate)
+            let localizedPrefix = prefix.isEmpty ? "" : NSLocalizedString(prefix, comment: "") + ", "
+            return localizedPrefix + formatter.string(from: fullDate)
         } else {
             return ""
         }
@@ -99,7 +100,7 @@ public extension DateFormatterService {
             if date.isToday {
                 ("", mediumTime.rawValue)
             } else if date.isYesterday {
-                ("Вчера, ", mediumTime.rawValue)
+                ("Вчера", mediumTime.rawValue)
             } else if date.isThisYear {
                 (
                     "",
diff --git a/SwiftUI-WorkoutApp/Resources/Localizable.xcstrings b/SwiftUI-WorkoutApp/Resources/Localizable.xcstrings
@@ -1033,6 +1033,17 @@
         }
       }
     },
+    "Вчера" : {
+      "extractionState" : "manual",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Yesterday"
+          }
+        }
+      }
+    },
     "Выбери город" : {
       "extractionState" : "manual",
       "localizations" : {

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,8 @@ public enum DateFormatterService {`
`16`	`16`	`showTimeInThisYear: showTimeInThisYear`
`17`	`17`	`)`
`18`	`18`	`formatter.dateFormat = dateFormat`
`19`		`- return prefix + formatter.string(from: fullDate)`
	`19`	`+ let localizedPrefix = prefix.isEmpty ? "" : NSLocalizedString(prefix, comment: "") + ", "`
	`20`	`+ return localizedPrefix + formatter.string(from: fullDate)`
`20`	`21`	`} else {`
`21`	`22`	`return ""`
`22`	`23`	`}`
`@@ -99,7 +100,7 @@ public extension DateFormatterService {`
`99`	`100`	`if date.isToday {`
`100`	`101`	`("", mediumTime.rawValue)`
`101`	`102`	`} else if date.isYesterday {`
`102`		`- ("Вчера, ", mediumTime.rawValue)`
	`103`	`+ ("Вчера", mediumTime.rawValue)`
`103`	`104`	`} else if date.isThisYear {`
`104`	`105`	`(`
`105`	`106`	`"",`