From cd02922b031f38e90bdfa2e63091535ab28d34de Mon Sep 17 00:00:00 2001
From: surfdude29 <149612116+surfdude29@users.noreply.github.com>
Date: Sat, 20 Jan 2024 20:57:19 +0000
Subject: use ISO 3166-1 alpha-2 names for UK and Virgin Islands (US) (#2585)

---
 src/lib/country-codes.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/lib/country-codes.ts')

diff --git a/src/lib/country-codes.ts b/src/lib/country-codes.ts
index c7afc62ad..ecfeb8eae 100644
--- a/src/lib/country-codes.ts
+++ b/src/lib/country-codes.ts
@@ -91,7 +91,6 @@ export const COUNTRY_CODES: CountryCodeMap[] = [
   {code2: 'DE', name: 'Germany (+49)'},
   {code2: 'GH', name: 'Ghana (+233)'},
   {code2: 'GI', name: 'Gibraltar (+350)'},
-  {code2: 'GB', name: 'Great Britain (+44)'},
   {code2: 'GR', name: 'Greece (+30)'},
   {code2: 'GL', name: 'Greenland (+299)'},
   {code2: 'GD', name: 'Grenada (+1)'},
@@ -237,14 +236,15 @@ export const COUNTRY_CODES: CountryCodeMap[] = [
   {code2: 'UG', name: 'Uganda (+256)'},
   {code2: 'UA', name: 'Ukraine (+380)'},
   {code2: 'AE', name: 'United Arab Emirates (+971)'},
+  {code2: 'GB', name: 'United Kingdom of Great Britain and Northern Ireland (+44)'},
   {code2: 'US', name: 'United States of America (+1)'},
   {code2: 'UY', name: 'Uruguay (+598)'},
   {code2: 'UZ', name: 'Uzbekistan (+998)'},
   {code2: 'VU', name: 'Vanuatu (+678)'},
   {code2: 'VE', name: 'Venezuela (Bolivarian Republic of) (+58)'},
   {code2: 'VN', name: 'Viet Nam (+84)'},
-  {code2: 'VI', name: 'Virgin Islands (+1)'},
   {code2: 'VG', name: 'Virgin Islands (British) (+1)'},
+  {code2: 'VI', name: 'Virgin Islands (U.S.) (+1)'},
   {code2: 'WF', name: 'Wallis and Futuna (+681)'},
   {code2: 'EH', name: 'Western Sahara (+212)'},
   {code2: 'YE', name: 'Yemen (+967)'},
-- 
cgit 1.4.1


From d51ad1fec94ef933eafe0e5f58fba810e349494b Mon Sep 17 00:00:00 2001
From: Minseo Lee <itoupluk427@gmail.com>
Date: Tue, 23 Jan 2024 07:55:56 +0900
Subject: Fix typos, improve localization and unify separators (#2502)

* Correct a typing error in `FeedItem.tsx` and replace the middle dot in `Drawer.tsx` with a bullet.

* Bullet to middle dot

* `liked your custom feed{0}` to `liked your custom feed {0}`

* Revert "`liked your custom feed{0}` to `liked your custom feed {0}`"

This reverts commit 43ae67bd03abad59b15dceb12a54255d7ad302e9.

* Update FeedItem.tsx

* Update country-codes.ts
---
 src/lib/country-codes.ts                    | 5 ++++-
 src/view/com/notifications/FeedItem.tsx     | 8 +++-----
 src/view/com/post-thread/PostThreadItem.tsx | 2 +-
 src/view/com/posts/FeedItem.tsx             | 2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'src/lib/country-codes.ts')

diff --git a/src/lib/country-codes.ts b/src/lib/country-codes.ts
index ecfeb8eae..ae0152876 100644
--- a/src/lib/country-codes.ts
+++ b/src/lib/country-codes.ts
@@ -236,7 +236,10 @@ export const COUNTRY_CODES: CountryCodeMap[] = [
   {code2: 'UG', name: 'Uganda (+256)'},
   {code2: 'UA', name: 'Ukraine (+380)'},
   {code2: 'AE', name: 'United Arab Emirates (+971)'},
-  {code2: 'GB', name: 'United Kingdom of Great Britain and Northern Ireland (+44)'},
+  {
+    code2: 'GB',
+    name: 'United Kingdom of Great Britain and Northern Ireland (+44)',
+  },
   {code2: 'US', name: 'United States of America (+1)'},
   {code2: 'UY', name: 'Uruguay (+598)'},
   {code2: 'UZ', name: 'Uzbekistan (+998)'},
diff --git a/src/view/com/notifications/FeedItem.tsx b/src/view/com/notifications/FeedItem.tsx
index e9d8b63e2..0dfac2a83 100644
--- a/src/view/com/notifications/FeedItem.tsx
+++ b/src/view/com/notifications/FeedItem.tsx
@@ -167,11 +167,9 @@ let FeedItem = ({
     icon = 'user-plus'
     iconStyle = [s.blue3 as FontAwesomeIconStyle]
   } else if (item.type === 'feedgen-like') {
-    action = _(
-      msg`liked your custom feed${
-        item.subjectUri ? ` '${new AtUri(item.subjectUri).rkey}'` : ''
-      }`,
-    )
+    action = item.subjectUri
+      ? _(msg`liked your custom feed '${new AtUri(item.subjectUri).rkey}'`)
+      : _(msg`liked your custom feed`)
     icon = 'HeartIconSolid'
     iconStyle = [
       s.likeColor as FontAwesomeIconStyle,
diff --git a/src/view/com/post-thread/PostThreadItem.tsx b/src/view/com/post-thread/PostThreadItem.tsx
index cd218a062..c811cd12b 100644
--- a/src/view/com/post-thread/PostThreadItem.tsx
+++ b/src/view/com/post-thread/PostThreadItem.tsx
@@ -706,7 +706,7 @@ function ExpandedPostDetails({
       <Text style={pal.textLight}>{niceDate(post.indexedAt)}</Text>
       {needsTranslation && (
         <>
-          <Text style={[pal.textLight, s.ml5, s.mr5]}>•</Text>
+          <Text style={pal.textLight}> &middot; </Text>
           <Link href={translatorUrl} title={_(msg`Translate`)}>
             <Text style={pal.link}>
               <Trans>Translate</Trans>
diff --git a/src/view/com/posts/FeedItem.tsx b/src/view/com/posts/FeedItem.tsx
index 8dee4ed49..a8aff0510 100644
--- a/src/view/com/posts/FeedItem.tsx
+++ b/src/view/com/posts/FeedItem.tsx
@@ -205,7 +205,7 @@ let FeedItemInner = ({
               title={_(
                 msg`Reposted by ${sanitizeDisplayName(
                   reason.by.displayName || reason.by.handle,
-                )})`,
+                )}`,
               )}>
               <FontAwesomeIcon
                 icon="retweet"
-- 
cgit 1.4.1