Merge branch 'main' into bdm/fix-crash

# Conflicts: # CHANGELOG.md
planetary-social · Nov 1, 2024 · 380d9e8 · 380d9e8
2 parents 850f4b1 + 2b4c812
commit 380d9e8
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 
 ### Release Notes
+- Fix typo in minimum age warning
 - Fix crash when tapping Post button on macOS. [#1687](https://github.com/planetary-social/nos/issues/1687)
 
 ### Internal Changes

diff --git a/Nos/Assets/Localization/Localizable.xcstrings b/Nos/Assets/Localization/Localizable.xcstrings
@@ -13366,25 +13366,25 @@
         "en" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Sorry, but Nos is not for you yet,"
+            "value" : "Sorry, but Nos is not for you yet."
           }
         },
         "es" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Lo sentimos, pero Nos aún no es para ti,"
+            "value" : "Lo sentimos, pero Nos aún no es para ti."
           }
         },
         "fa" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "متاسفیم، اما نوس هنوز مناسب شما نیست،"
           }
         },
         "fr" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Désolé, mais Nos n'est pas pour vous pour l'instant,"
+            "value" : "Désolé, mais Nos n'est pas pour vous pour l'instant."
           }
         },
         "ja" : {
@@ -13402,25 +13402,25 @@
         "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Sorry, maar Nos is nog niet iets voor jou,"
+            "value" : "Sorry, maar Nos is nog niet iets voor jou."
           }
         },
         "pt-BR" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Desculpa, mas o Nos não é para você ainda,"
+            "value" : "Desculpa, mas o Nos não é para você ainda."
           }
         },
         "sv" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Tyvärr, men Nos är inte för er ännu,"
+            "value" : "Tyvärr, men Nos är inte för er ännu."
           }
         },
         "sw" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Pole, lakini Nos bado sio yako,"
+            "value" : "Pole, lakini Nos bado sio yako."
           }
         },
         "th" : {

diff --git a/Nos/Models/CoreData/Event+Fetching.swift b/Nos/Models/CoreData/Event+Fetching.swift
@@ -129,9 +129,9 @@ extension Event {
 
     /// A request for all events that responded to a specific note.
     ///
-    /// - Parameter noteIdentifier: ID of the note to retrieve replies for.
+    /// - Parameter noteID: ID of the note to retrieve replies for.
     ///
-    /// Intented to be used primarily to compute the number of replies and for
+    /// Intended to be used primarily to compute the number of replies and for
     /// building a set of author avatars.
     @nonobjc public class func replies(to noteID: RawEventID) -> NSFetchRequest<Event> {
         let format = """