Merge pull request #295 from tooot-app/l10n_main

New Crowdin updates

.envrc.example

@@ -3,9 +3,6 @@ export ENVIRONMENT="development"
 export SENTRY_ORGANIZATION=""
 export SENTRY_PROJECT=""
 export SENTRY_AUTH_TOKEN=""
-export SENTRY_DSN=""
-
-export TOOOT_PUSH_KEY_PUBLIC=""
 
 # Fastlane start
 export LC_ALL=""

.github/workflows/build.yml

@@ -43,8 +43,6 @@ jobs:
           SENTRY_ORGANIZATION: ${{ secrets.SENTRY_ORGANIZATION }}
           SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
           SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
-          SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
-          TOOOT_PUSH_KEY_PUBLIC: ${{ secrets.TOOOT_PUSH_KEY_PUBLIC }}
           FASTLANE_USER: ${{ secrets.FASTLANE_USER }}
           MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
           MATCH_GIT_URL: ${{ secrets.MATCH_GIT_URL }}

app.config.ts

@@ -12,10 +12,6 @@ export default (): ExpoConfig => ({
   version: toootVersion,
   privacy: 'hidden',
   assetBundlePatterns: ['assets/*'],
-  extra: {
-    sentryDSN: process.env.SENTRY_DSN,
-    toootPushKeyPublic: process.env.TOOOT_PUSH_KEY_PUBLIC
-  },
   hooks: {
     postPublish: [
       {

src/i18n/zh-Hans/components/timeline.json

@@ -101,7 +101,7 @@
             "accessibilityHint": "用户帐户名"
           }
         },
-        "application": "发自于 {{application}}",
+        "application": "发自{{application}}",
         "edited": {
           "accessibilityLabel": "嘟文已编辑"
         },
@@ -113,7 +113,7 @@
             "accessibilityLabel": "此嘟文是私信"
           },
           "private": {
-            "accessibilityLabel": "此嘟文仅关注着可见"
+            "accessibilityLabel": "此嘟文仅关注者可见"
           }
         }
       },
@@ -184,13 +184,13 @@
             }
           },
           "deleteEdit": {
-            "function": "删除嘟文",
-            "button": "删除此条嘟文",
+            "function": "删除并重新编辑",
+            "button": "删除并重新编辑此条嘟文",
             "alert": {
               "title": "确认删除嘟文？",
               "message": "确定要删除这条嘟文并重新编辑它吗？所有相关的转嘟和喜欢都会被清除，回复将会失去关联。",
               "buttons": {
-                "confirm": "确认删除",
+                "confirm": "删除并重新编辑",
                 "cancel": "$t(common:buttons.cancel)"
               }
             }

src/screens/Tabs/Me/Push.tsx

@@ -51,7 +51,7 @@ const TabMePush: React.FC = () => {
     } else {
       Notifications.getExpoPushTokenAsync({
         experienceId: '@xmflsct/tooot',
-        applicationId: 'com.xmflsct.tooot.app'
+        applicationId: 'com.xmflsct.app.tooot'
       })
         .then(data => setPushAvailable(!!data))
         .catch(() => setPushAvailable(false))

src/startup/sentry.ts

@@ -1,14 +1,13 @@
-import { isDevelopment } from '@utils/checkEnvironment'
-import Constants from 'expo-constants'
+import { isRelease } from '@utils/checkEnvironment'
 import * as Sentry from 'sentry-expo'
 import log from './log'
 
 const sentry = () => {
   log('log', 'Sentry', 'initializing')
   Sentry.init({
-    dsn: Constants.manifest?.extra?.sentryDSN,
-    enableInExpoDevelopment: false,
-    debug: isDevelopment
+    dsn: 'https://53348b60ff844d52886e90251b3a5f41@o917354.ingest.sentry.io/6410576',
+    enableInExpoDevelopment: true,
+    debug: !isRelease
   })
 }
 

src/utils/push/useConnect.ts

@@ -26,7 +26,7 @@ const pushUseConnect = ({ t, instances }: Params) => {
         : (
             await Notifications.getExpoPushTokenAsync({
               experienceId: '@xmflsct/tooot',
-              applicationId: 'com.xmflsct.tooot.app'
+              applicationId: 'com.xmflsct.app.tooot'
             })
           ).data
 

src/utils/slices/instances/push/register.ts

@@ -3,7 +3,6 @@ import apiTooot, { TOOOT_API_DOMAIN } from '@api/tooot'
 import i18n from '@root/i18n/i18n'
 import { RootState } from '@root/store'
 import { getInstance, Instance } from '@utils/slices/instancesSlice'
-import Constants from 'expo-constants'
 import * as Notifications from 'expo-notifications'
 import * as Random from 'expo-random'
 import { Platform } from 'react-native'
@@ -57,7 +56,7 @@ const pushRegister = async (
   formData.append('subscription[endpoint]', endpoint)
   formData.append(
     'subscription[keys][p256dh]',
-    Constants.manifest?.extra?.toootPushKeyPublic
+    'BMn2PLpZrMefG981elzG6SB1EY9gU7QZwmtZ/a/J2vUeWG+zXgeskMPwHh4T/bxsD4l7/8QT94F57CbZqYRRfJo='
   )
   formData.append('subscription[keys][auth]', auth)
   Object.keys(alerts).map(key =>

src/utils/slices/instances/updatePush.ts

@@ -18,7 +18,7 @@ export const updateInstancePush = createAsyncThunk(
       : (
           await Notifications.getExpoPushTokenAsync({
             experienceId: '@xmflsct/tooot',
-            applicationId: 'com.xmflsct.tooot.app'
+            applicationId: 'com.xmflsct.app.tooot'
           })
         ).data
 

src/utils/slices/instances/updatePushDecode.ts

@@ -25,7 +25,7 @@ export const updateInstancePushDecode = createAsyncThunk(
       : (
           await Notifications.getExpoPushTokenAsync({
             experienceId: '@xmflsct/tooot',
-            applicationId: 'com.xmflsct.tooot.app'
+            applicationId: 'com.xmflsct.app.tooot'
           })
         ).data