diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8ab308d1..9895c962 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,7 +2,6 @@ name: build on: push: branches: - - main - candidate - release diff --git a/Gemfile.lock b/Gemfile.lock index fb410963..7b2accf9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,7 +2,7 @@ GEM remote: https://rubygems.org/ specs: CFPropertyList (3.0.3) - activesupport (5.2.4.5) + activesupport (5.2.5) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -15,7 +15,7 @@ GEM artifactory (3.0.15) atomos (0.1.3) aws-eventstream (1.1.1) - aws-partitions (1.432.0) + aws-partitions (1.436.0) aws-sdk-core (3.113.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) @@ -24,7 +24,7 @@ GEM aws-sdk-kms (1.43.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.91.0) + aws-sdk-s3 (1.93.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) @@ -97,7 +97,7 @@ GEM faraday_middleware (1.0.0) faraday (~> 1.0) fastimage (2.2.3) - fastlane (2.178.0) + fastlane (2.179.0) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.3, < 3.0.0) artifactory (~> 3.0) @@ -196,7 +196,7 @@ GEM jwt (2.2.2) memoist (0.16.2) mini_magick (4.11.0) - mini_mime (1.0.2) + mini_mime (1.0.3) minitest (5.14.4) molinillo (0.6.6) multi_json (1.15.0) @@ -260,7 +260,7 @@ GEM xcpretty (~> 0.2, >= 0.0.7) PLATFORMS - ruby + universal-darwin-20 DEPENDENCIES cocoapods diff --git a/assets/screens/meRoot/welcome.png b/assets/images/welcome.png similarity index 100% rename from assets/screens/meRoot/welcome.png rename to assets/images/welcome.png diff --git a/crowdin.yml b/crowdin.yml new file mode 100644 index 00000000..061efd79 --- /dev/null +++ b/crowdin.yml @@ -0,0 +1,10 @@ +# 'preserve_hierarchy': true + +files: + [ + { + 'source': '/src/i18n/en/**/*.json', + 'translation': '/src/i18n/%osx_locale%/**/%original_file_name%', + 'ignore': ['*.ts'], + }, + ] diff --git a/fastlane/Fastfile b/fastlane/Fastfile index db926d36..c1d922ea 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -1,4 +1,4 @@ -fastlane_version "2.178.0" +fastlane_version "2.179.0" skip_docs ensure_env_vars( diff --git a/src/App.tsx b/src/App.tsx index 0ef71933..399cf6ea 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -88,7 +88,8 @@ const App: React.FC = () => { log('log', 'App', 'bootstrapped') if (bootstrapped) { log('log', 'App', 'loading actual app :)') - i18n.changeLanguage(getSettingsLanguage(store.getState())) + const language = getSettingsLanguage(store.getState()) + i18n.changeLanguage(language) return ( diff --git a/src/Screens.tsx b/src/Screens.tsx index c156b45a..83bfade6 100644 --- a/src/Screens.tsx +++ b/src/Screens.tsx @@ -28,15 +28,14 @@ import { useDispatch, useSelector } from 'react-redux' import * as Sentry from 'sentry-expo' const Stack = createNativeStackNavigator() +export const navigationRef = createRef() export interface Props { localCorrupt?: string } -export const navigationRef = createRef() - const Screens: React.FC = ({ localCorrupt }) => { - const { t } = useTranslation('common') + const { t } = useTranslation('screens') const dispatch = useDispatch() const instanceActive = useSelector(getInstanceActive) const { mode, theme } = useTheme() @@ -93,7 +92,7 @@ const Screens: React.FC = ({ localCorrupt }) => { const showLocalCorrect = () => { if (localCorrupt) { displayMessage({ - message: t('index.localCorrupt'), + message: t('localCorrupt.message'), description: localCorrupt.length ? localCorrupt : undefined, type: 'error', mode diff --git a/src/components/Instance.tsx b/src/components/Instance.tsx index deba3c5d..e9aeb412 100644 --- a/src/components/Instance.tsx +++ b/src/components/Instance.tsx @@ -131,13 +131,30 @@ const ComponentInstance: React.FC = ({ {!disableHeaderImage ? ( ) : null} + + } + /> = ({ id }) => { displayMessage({ type: 'error', mode, - message: t('common:toastMessage.error.message', { + message: t('common:message.error.message', { function: t(`relationship:${type}.function`) }), ...(err.status && diff --git a/src/components/Relationship/Outgoing.tsx b/src/components/Relationship/Outgoing.tsx index 230639d1..783e3951 100644 --- a/src/components/Relationship/Outgoing.tsx +++ b/src/components/Relationship/Outgoing.tsx @@ -42,7 +42,7 @@ const RelationshipOutgoing = React.memo( displayMessage({ mode, type: 'error', - message: t('common:toastMessage.error.message', { + message: t('common:message.error.message', { function: t(`${action}.function`) }), ...(err.status && diff --git a/src/components/Timeline.tsx b/src/components/Timeline.tsx index bc9d8f59..f554c58e 100644 --- a/src/components/Timeline.tsx +++ b/src/components/Timeline.tsx @@ -139,7 +139,7 @@ const Timeline: React.FC = ({ ref={customFLRef || flRef} scrollEventThrottle={16} onScroll={onScroll} - windowSize={10} + windowSize={7} data={flattenData} initialNumToRender={6} maxToRenderPerBatch={3} diff --git a/src/components/Timeline/Shared/Actions.tsx b/src/components/Timeline/Shared/Actions.tsx index 11323b4c..9c6b540b 100644 --- a/src/components/Timeline/Shared/Actions.tsx +++ b/src/components/Timeline/Shared/Actions.tsx @@ -85,7 +85,7 @@ const TimelineActions: React.FC = ({ displayMessage({ mode, type: 'error', - message: t('common:toastMessage.error.message', { + message: t('common:message.error.message', { function: t( `shared.actions.${correctParam.payload.property}.function` ) diff --git a/src/components/Timeline/Shared/Attachment/Image.tsx b/src/components/Timeline/Shared/Attachment/Image.tsx index ae7a446a..9f3086dd 100644 --- a/src/components/Timeline/Shared/Attachment/Image.tsx +++ b/src/components/Timeline/Shared/Attachment/Image.tsx @@ -2,7 +2,7 @@ import analytics from '@components/analytics' import GracefullyImage from '@components/GracefullyImage' import { StyleConstants } from '@utils/styles/constants' import React, { useCallback } from 'react' -import { StyleSheet } from 'react-native' +import { StyleSheet, View } from 'react-native' import attachmentAspectRatio from './aspectRatio' export interface Props { @@ -21,16 +21,15 @@ const AttachmentImage = React.memo( }, []) return ( -