Merge branch 'main' into candidate

tooot-app · Mar 14, 2023 · 232705b · 232705b
2 parents 6e316f0 + f78693e
commit 232705b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/components/Timeline/Shared/Card/index.tsx b/src/components/Timeline/Shared/Card/index.tsx
@@ -22,7 +22,7 @@ const TimelineCard: React.FC = () => {
  if (!status || !status.card) return null
 
  const { i18n } = useTranslation()
- if (status.card.url.includes('://neodb.social/') && i18n.language === 'zh-hans') {
+ if (status.card.url.includes('://neodb.social/') && i18n.language.toLowerCase() === 'zh-hans') {
  return <CardNeodb card={status.card} />
  }
 

diff --git a/src/screens/Tabs/Me/Settings/App.tsx b/src/screens/Tabs/Me/Settings/App.tsx
@@ -59,7 +59,7 @@ const SettingsApp: React.FC = () => {
  // @ts-ignore
  LOCALES[
  Platform.OS === 'ios'
- ? Localization.locale.replace(new RegExp(/.*-.*(-.*)/, 'i'), '')
+ ? Localization.locale.replace(new RegExp(/.*-.*(-.*)/, 'i'), '').toLowerCase()
  : i18n.language.toLowerCase()
  ]
  }