Merge pull request #1089 from planetary-social/feature/flag-this-user

Change “Report user” to “Flag this user”; make it non-destructive
planetary-social · Apr 29, 2024 · 7f1dd4a · 7f1dd4a
2 parents 2550e28 + d5ec4fb
commit 7f1dd4a
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 54 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fixed an issue where users named with valid urls were unable to be mentioned correctly.
 - Fixed an issue where pasting an npub while composing a note created an invalid mention.
 - Changed "Report note" button to "Flag this content"
+- Changed "Report user" button to "Flag this user"
 - We are now publishing the relay list when registering a new NIP-05 username so
 that other users can find you more easily.
 

diff --git a/Nos/Assets/Localization/Localizable.xcstrings b/Nos/Assets/Localization/Localizable.xcstrings
@@ -4231,6 +4231,59 @@
         }
       }
     },
+    "flagUser" : {
+      "extractionState" : "manual",
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "needs_review",
+            "value" : "Benutzer melden"
+          }
+        },
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Flag this user"
+          }
+        },
+        "fa" : {
+          "stringUnit" : {
+            "state" : "needs_review",
+            "value" : "گزارش کاربر"
+          }
+        },
+        "ja" : {
+          "stringUnit" : {
+            "state" : "needs_review",
+            "value" : "ユーザーを報告する"
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "needs_review",
+            "value" : "Rapporteer gebruiker"
+          }
+        },
+        "sv" : {
+          "stringUnit" : {
+            "state" : "needs_review",
+            "value" : "Rapportera användare"
+          }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "needs_review",
+            "value" : "举报用户"
+          }
+        },
+        "zh-Hant" : {
+          "stringUnit" : {
+            "state" : "needs_review",
+            "value" : "舉報用戶"
+          }
+        }
+      }
+    },
     "follow" : {
       "extractionState" : "manual",
       "localizations" : {
@@ -10096,59 +10149,6 @@
         }
       }
     },
-    "reportUser" : {
-      "extractionState" : "manual",
-      "localizations" : {
-        "de" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Benutzer melden"
-          }
-        },
-        "en" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Report user"
-          }
-        },
-        "fa" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "گزارش کاربر"
-          }
-        },
-        "ja" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "ユーザーを報告する"
-          }
-        },
-        "nl" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Rapporteer gebruiker"
-          }
-        },
-        "sv" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Rapportera användare"
-          }
-        },
-        "zh-Hans" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "举报用户"
-          }
-        },
-        "zh-Hant" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "舉報用戶"
-          }
-        }
-      }
-    },
     "repost" : {
       "extractionState" : "manual",
       "localizations" : {

diff --git a/Nos/Views/Profile/ProfileView.swift b/Nos/Views/Profile/ProfileView.swift
@@ -178,7 +178,7 @@ struct ProfileView: View {
                                 }
                             }
 
-                            Button(String(localized: .localizable.reportUser), role: .destructive) {
+                            Button(String(localized: .localizable.flagUser)) {
                                 showingReportMenu = true
                             }
                         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -178,7 +178,7 @@ struct ProfileView: View { @@
                                     }
                                 }
-                                Button(String(localized: .localizable.reportUser), role: .destructive) {
+                                Button(String(localized: .localizable.flagUser)) {
                                     showingReportMenu = true
                                 }
                             }
@@ Expand Down @@