Compare commits

...

4 Commits

Author SHA1 Message Date
xmflsct ced75ba168
Merge pull request #351 from tooot-app/main
Release v4.1.6
2022-06-26 23:07:19 +02:00
Zhiyuan Zheng 249320a3b5 Target translation language rule
App language may be in en while the spoken language is others, due to limited translation options
2022-06-26 22:59:46 +02:00
Zhiyuan Zheng 6f774d8c13 Fixed #350 2022-06-26 22:56:21 +02:00
Zhiyuan Zheng c457141e10 Fix source map missing 2022-06-25 00:51:13 +02:00
4 changed files with 8 additions and 3 deletions

View File

@ -110,6 +110,9 @@ jobs:
ENVIRONMENT: ${{ steps.branch.outputs.branch }}
LC_ALL: en_US.UTF-8
LANG: en_US.UTF-8
SENTRY_ORGANIZATION: ${{ secrets.SENTRY_ORGANIZATION }}
SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
ANDROID_KEYSTORE: ${{ secrets.ANDROID_KEYSTORE }}
ANDROID_KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
ANDROID_KEYSTORE_ALIAS: ${{ secrets.ANDROID_KEYSTORE_ALIAS }}

View File

@ -4,7 +4,7 @@
"native": "220603",
"major": 4,
"minor": 1,
"patch": 5,
"patch": 6,
"expo": "45.0.0"
},
"description": "tooot app for Mastodon",

View File

@ -24,7 +24,7 @@ export interface Props {
}
const TimelineHeaderDefault = ({ queryKey, status, highlighted }: Props) => {
if (!queryKey) return
if (!queryKey) return null
const { t } = useTranslation('componentContextMenu')
const { colors } = useTheme()

View File

@ -57,7 +57,9 @@ const TimelineTranslate = React.memo(
}, [])
const settingsLanguage = useSelector(getSettingsLanguage)
const targetLanguage = Localization.locale || settingsLanguage || 'en'
const targetLanguage = settingsLanguage?.startsWith('en')
? Localization.locale || settingsLanguage || 'en'
: settingsLanguage || Localization.locale || 'en'
const [enabled, setEnabled] = useState(false)
const { refetch, data, isLoading, isSuccess, isError } = useTranslateQuery({