diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/components/auth/Login.js | 3 | ||||
-rw-r--r-- | src/i18n/locales/defaultMessages.json | 122 | ||||
-rw-r--r-- | src/i18n/locales/en-US.json | 10 |
3 files changed, 107 insertions, 28 deletions
diff --git a/src/components/auth/Login.js b/src/components/auth/Login.js index 1563e471a..270dff30b 100644 --- a/src/components/auth/Login.js +++ b/src/components/auth/Login.js | |||
@@ -149,7 +149,8 @@ export default @observer class Login extends Component { | |||
149 | <p className="error-message center">{intl.formatMessage(messages.invalidCredentials)}</p> | 149 | <p className="error-message center">{intl.formatMessage(messages.invalidCredentials)}</p> |
150 | { window.ferdi.stores.settings.all.app.server !== 'https://api.franzinfra.com' && ( | 150 | { window.ferdi.stores.settings.all.app.server !== 'https://api.franzinfra.com' && ( |
151 | <p className="error-message center"> | 151 | <p className="error-message center"> |
152 | {intl.formatMessage(messages.customServerQuestion)}{' '} | 152 | {intl.formatMessage(messages.customServerQuestion)} |
153 | {' '} | ||
153 | <Link | 154 | <Link |
154 | to={`${window.ferdi.stores.settings.all.app.server.replace('v1', '')}/import`} | 155 | to={`${window.ferdi.stores.settings.all.app.server.replace('v1', '')}/import`} |
155 | target="_blank" | 156 | target="_blank" |
diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json index 2e73fef1b..5958b4835 100644 --- a/src/i18n/locales/defaultMessages.json +++ b/src/i18n/locales/defaultMessages.json | |||
@@ -264,55 +264,81 @@ | |||
264 | } | 264 | } |
265 | }, | 265 | }, |
266 | { | 266 | { |
267 | "defaultMessage": "!!!Your session expired, please login again.", | 267 | "defaultMessage": "!!!Using a custom Ferdi server?", |
268 | "end": { | 268 | "end": { |
269 | "column": 3, | 269 | "column": 3, |
270 | "line": 40 | 270 | "line": 40 |
271 | }, | 271 | }, |
272 | "file": "src/components/auth/Login.js", | 272 | "file": "src/components/auth/Login.js", |
273 | "id": "login.customServerQuestion", | ||
274 | "start": { | ||
275 | "column": 24, | ||
276 | "line": 37 | ||
277 | } | ||
278 | }, | ||
279 | { | ||
280 | "defaultMessage": "!!!Try importing your Franz account", | ||
281 | "end": { | ||
282 | "column": 3, | ||
283 | "line": 44 | ||
284 | }, | ||
285 | "file": "src/components/auth/Login.js", | ||
286 | "id": "login.customServerSuggestion", | ||
287 | "start": { | ||
288 | "column": 26, | ||
289 | "line": 41 | ||
290 | } | ||
291 | }, | ||
292 | { | ||
293 | "defaultMessage": "!!!Your session expired, please login again.", | ||
294 | "end": { | ||
295 | "column": 3, | ||
296 | "line": 48 | ||
297 | }, | ||
298 | "file": "src/components/auth/Login.js", | ||
273 | "id": "login.tokenExpired", | 299 | "id": "login.tokenExpired", |
274 | "start": { | 300 | "start": { |
275 | "column": 16, | 301 | "column": 16, |
276 | "line": 37 | 302 | "line": 45 |
277 | } | 303 | } |
278 | }, | 304 | }, |
279 | { | 305 | { |
280 | "defaultMessage": "!!!Your session expired, please login again.", | 306 | "defaultMessage": "!!!Your session expired, please login again.", |
281 | "end": { | 307 | "end": { |
282 | "column": 3, | 308 | "column": 3, |
283 | "line": 44 | 309 | "line": 52 |
284 | }, | 310 | }, |
285 | "file": "src/components/auth/Login.js", | 311 | "file": "src/components/auth/Login.js", |
286 | "id": "login.serverLogout", | 312 | "id": "login.serverLogout", |
287 | "start": { | 313 | "start": { |
288 | "column": 16, | 314 | "column": 16, |
289 | "line": 41 | 315 | "line": 49 |
290 | } | 316 | } |
291 | }, | 317 | }, |
292 | { | 318 | { |
293 | "defaultMessage": "!!!Create a free account", | 319 | "defaultMessage": "!!!Create a free account", |
294 | "end": { | 320 | "end": { |
295 | "column": 3, | 321 | "column": 3, |
296 | "line": 48 | 322 | "line": 56 |
297 | }, | 323 | }, |
298 | "file": "src/components/auth/Login.js", | 324 | "file": "src/components/auth/Login.js", |
299 | "id": "login.link.signup", | 325 | "id": "login.link.signup", |
300 | "start": { | 326 | "start": { |
301 | "column": 14, | 327 | "column": 14, |
302 | "line": 45 | 328 | "line": 53 |
303 | } | 329 | } |
304 | }, | 330 | }, |
305 | { | 331 | { |
306 | "defaultMessage": "!!!Forgot password", | 332 | "defaultMessage": "!!!Forgot password", |
307 | "end": { | 333 | "end": { |
308 | "column": 3, | 334 | "column": 3, |
309 | "line": 52 | 335 | "line": 60 |
310 | }, | 336 | }, |
311 | "file": "src/components/auth/Login.js", | 337 | "file": "src/components/auth/Login.js", |
312 | "id": "login.link.password", | 338 | "id": "login.link.password", |
313 | "start": { | 339 | "start": { |
314 | "column": 16, | 340 | "column": 16, |
315 | "line": 49 | 341 | "line": 57 |
316 | } | 342 | } |
317 | } | 343 | } |
318 | ], | 344 | ], |
@@ -703,6 +729,19 @@ | |||
703 | "column": 26, | 729 | "column": 26, |
704 | "line": 33 | 730 | "line": 33 |
705 | } | 731 | } |
732 | }, | ||
733 | { | ||
734 | "defaultMessage": "!!!There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists.", | ||
735 | "end": { | ||
736 | "column": 3, | ||
737 | "line": 40 | ||
738 | }, | ||
739 | "file": "src/components/layout/AppLayout.js", | ||
740 | "id": "infobar.authRequestFailed", | ||
741 | "start": { | ||
742 | "column": 21, | ||
743 | "line": 37 | ||
744 | } | ||
706 | } | 745 | } |
707 | ], | 746 | ], |
708 | "path": "src/components/layout/AppLayout.json" | 747 | "path": "src/components/layout/AppLayout.json" |
@@ -918,6 +957,32 @@ | |||
918 | "column": 14, | 957 | "column": 14, |
919 | "line": 15 | 958 | "line": 15 |
920 | } | 959 | } |
960 | }, | ||
961 | { | ||
962 | "defaultMessage": "!!!Please login to use Ferdi.", | ||
963 | "end": { | ||
964 | "column": 3, | ||
965 | "line": 22 | ||
966 | }, | ||
967 | "file": "src/components/services/content/Services.js", | ||
968 | "id": "services.login", | ||
969 | "start": { | ||
970 | "column": 9, | ||
971 | "line": 19 | ||
972 | } | ||
973 | }, | ||
974 | { | ||
975 | "defaultMessage": "!!!Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.", | ||
976 | "end": { | ||
977 | "column": 3, | ||
978 | "line": 26 | ||
979 | }, | ||
980 | "file": "src/components/services/content/Services.js", | ||
981 | "id": "services.serverInfo", | ||
982 | "start": { | ||
983 | "column": 14, | ||
984 | "line": 23 | ||
985 | } | ||
921 | } | 986 | } |
922 | ], | 987 | ], |
923 | "path": "src/components/services/content/Services.json" | 988 | "path": "src/components/services/content/Services.json" |
@@ -2991,94 +3056,107 @@ | |||
2991 | } | 3056 | } |
2992 | }, | 3057 | }, |
2993 | { | 3058 | { |
2994 | "defaultMessage": "!!!Language", | 3059 | "defaultMessage": "!!!Server", |
2995 | "end": { | 3060 | "end": { |
2996 | "column": 3, | 3061 | "column": 3, |
2997 | "line": 47 | 3062 | "line": 47 |
2998 | }, | 3063 | }, |
2999 | "file": "src/containers/settings/EditSettingsScreen.js", | 3064 | "file": "src/containers/settings/EditSettingsScreen.js", |
3065 | "id": "settings.app.form.server", | ||
3066 | "start": { | ||
3067 | "column": 10, | ||
3068 | "line": 44 | ||
3069 | } | ||
3070 | }, | ||
3071 | { | ||
3072 | "defaultMessage": "!!!Language", | ||
3073 | "end": { | ||
3074 | "column": 3, | ||
3075 | "line": 51 | ||
3076 | }, | ||
3077 | "file": "src/containers/settings/EditSettingsScreen.js", | ||
3000 | "id": "settings.app.form.language", | 3078 | "id": "settings.app.form.language", |
3001 | "start": { | 3079 | "start": { |
3002 | "column": 12, | 3080 | "column": 12, |
3003 | "line": 44 | 3081 | "line": 48 |
3004 | } | 3082 | } |
3005 | }, | 3083 | }, |
3006 | { | 3084 | { |
3007 | "defaultMessage": "!!!Dark Mode", | 3085 | "defaultMessage": "!!!Dark Mode", |
3008 | "end": { | 3086 | "end": { |
3009 | "column": 3, | 3087 | "column": 3, |
3010 | "line": 51 | 3088 | "line": 55 |
3011 | }, | 3089 | }, |
3012 | "file": "src/containers/settings/EditSettingsScreen.js", | 3090 | "file": "src/containers/settings/EditSettingsScreen.js", |
3013 | "id": "settings.app.form.darkMode", | 3091 | "id": "settings.app.form.darkMode", |
3014 | "start": { | 3092 | "start": { |
3015 | "column": 12, | 3093 | "column": 12, |
3016 | "line": 48 | 3094 | "line": 52 |
3017 | } | 3095 | } |
3018 | }, | 3096 | }, |
3019 | { | 3097 | { |
3020 | "defaultMessage": "!!!Display disabled services tabs", | 3098 | "defaultMessage": "!!!Display disabled services tabs", |
3021 | "end": { | 3099 | "end": { |
3022 | "column": 3, | 3100 | "column": 3, |
3023 | "line": 55 | 3101 | "line": 59 |
3024 | }, | 3102 | }, |
3025 | "file": "src/containers/settings/EditSettingsScreen.js", | 3103 | "file": "src/containers/settings/EditSettingsScreen.js", |
3026 | "id": "settings.app.form.showDisabledServices", | 3104 | "id": "settings.app.form.showDisabledServices", |
3027 | "start": { | 3105 | "start": { |
3028 | "column": 24, | 3106 | "column": 24, |
3029 | "line": 52 | 3107 | "line": 56 |
3030 | } | 3108 | } |
3031 | }, | 3109 | }, |
3032 | { | 3110 | { |
3033 | "defaultMessage": "!!!Show unread message badge when notifications are disabled", | 3111 | "defaultMessage": "!!!Show unread message badge when notifications are disabled", |
3034 | "end": { | 3112 | "end": { |
3035 | "column": 3, | 3113 | "column": 3, |
3036 | "line": 59 | 3114 | "line": 63 |
3037 | }, | 3115 | }, |
3038 | "file": "src/containers/settings/EditSettingsScreen.js", | 3116 | "file": "src/containers/settings/EditSettingsScreen.js", |
3039 | "id": "settings.app.form.showMessagesBadgesWhenMuted", | 3117 | "id": "settings.app.form.showMessagesBadgesWhenMuted", |
3040 | "start": { | 3118 | "start": { |
3041 | "column": 29, | 3119 | "column": 29, |
3042 | "line": 56 | 3120 | "line": 60 |
3043 | } | 3121 | } |
3044 | }, | 3122 | }, |
3045 | { | 3123 | { |
3046 | "defaultMessage": "!!!Enable spell checking", | 3124 | "defaultMessage": "!!!Enable spell checking", |
3047 | "end": { | 3125 | "end": { |
3048 | "column": 3, | 3126 | "column": 3, |
3049 | "line": 63 | 3127 | "line": 67 |
3050 | }, | 3128 | }, |
3051 | "file": "src/containers/settings/EditSettingsScreen.js", | 3129 | "file": "src/containers/settings/EditSettingsScreen.js", |
3052 | "id": "settings.app.form.enableSpellchecking", | 3130 | "id": "settings.app.form.enableSpellchecking", |
3053 | "start": { | 3131 | "start": { |
3054 | "column": 23, | 3132 | "column": 23, |
3055 | "line": 60 | 3133 | "line": 64 |
3056 | } | 3134 | } |
3057 | }, | 3135 | }, |
3058 | { | 3136 | { |
3059 | "defaultMessage": "!!!Enable GPU Acceleration", | 3137 | "defaultMessage": "!!!Enable GPU Acceleration", |
3060 | "end": { | 3138 | "end": { |
3061 | "column": 3, | 3139 | "column": 3, |
3062 | "line": 67 | 3140 | "line": 71 |
3063 | }, | 3141 | }, |
3064 | "file": "src/containers/settings/EditSettingsScreen.js", | 3142 | "file": "src/containers/settings/EditSettingsScreen.js", |
3065 | "id": "settings.app.form.enableGPUAcceleration", | 3143 | "id": "settings.app.form.enableGPUAcceleration", |
3066 | "start": { | 3144 | "start": { |
3067 | "column": 25, | 3145 | "column": 25, |
3068 | "line": 64 | 3146 | "line": 68 |
3069 | } | 3147 | } |
3070 | }, | 3148 | }, |
3071 | { | 3149 | { |
3072 | "defaultMessage": "!!!Include beta versions", | 3150 | "defaultMessage": "!!!Include beta versions", |
3073 | "end": { | 3151 | "end": { |
3074 | "column": 3, | 3152 | "column": 3, |
3075 | "line": 71 | 3153 | "line": 75 |
3076 | }, | 3154 | }, |
3077 | "file": "src/containers/settings/EditSettingsScreen.js", | 3155 | "file": "src/containers/settings/EditSettingsScreen.js", |
3078 | "id": "settings.app.form.beta", | 3156 | "id": "settings.app.form.beta", |
3079 | "start": { | 3157 | "start": { |
3080 | "column": 8, | 3158 | "column": 8, |
3081 | "line": 68 | 3159 | "line": 72 |
3082 | } | 3160 | } |
3083 | } | 3161 | } |
3084 | ], | 3162 | ], |
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json index 440002823..348b8e497 100644 --- a/src/i18n/locales/en-US.json +++ b/src/i18n/locales/en-US.json | |||
@@ -22,11 +22,11 @@ | |||
22 | "import.notSupportedHeadline": "Services not yet supported in Ferdi 5", | 22 | "import.notSupportedHeadline": "Services not yet supported in Ferdi 5", |
23 | "import.skip.label": "I want to add services manually", | 23 | "import.skip.label": "I want to add services manually", |
24 | "import.submit.label": "Import services", | 24 | "import.submit.label": "Import services", |
25 | "infobar.authRequestFailed": "There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists.", | ||
25 | "infobar.buttonChangelog": "What is new?", | 26 | "infobar.buttonChangelog": "What is new?", |
26 | "infobar.buttonInstallUpdate": "Restart & install update", | 27 | "infobar.buttonInstallUpdate": "Restart & install update", |
27 | "infobar.buttonReloadServices": "Reload services", | 28 | "infobar.buttonReloadServices": "Reload services", |
28 | "infobar.requiredRequestsFailed": "Could not load services and user information", | 29 | "infobar.requiredRequestsFailed": "Could not load services and user information", |
29 | "infobar.authRequestFailed": "There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists.", | ||
30 | "infobar.servicesUpdated": "Your services have been updated.", | 30 | "infobar.servicesUpdated": "Your services have been updated.", |
31 | "infobar.updateAvailable": "A new update for Ferdi is available.", | 31 | "infobar.updateAvailable": "A new update for Ferdi is available.", |
32 | "invite.email.label": "Email address", | 32 | "invite.email.label": "Email address", |
@@ -35,11 +35,11 @@ | |||
35 | "invite.skip.label": "I want to do this later", | 35 | "invite.skip.label": "I want to do this later", |
36 | "invite.submit.label": "Send invites", | 36 | "invite.submit.label": "Send invites", |
37 | "invite.successInfo": "Invitations sent successfully", | 37 | "invite.successInfo": "Invitations sent successfully", |
38 | "login.customServerQuestion": "Using a custom Ferdi server?", | ||
39 | "login.customServerSuggestion": "Try importing your Franz account", | ||
38 | "login.email.label": "Email address", | 40 | "login.email.label": "Email address", |
39 | "login.headline": "Sign in", | 41 | "login.headline": "Sign in", |
40 | "login.invalidCredentials": "Email or password not valid", | 42 | "login.invalidCredentials": "Email or password not valid", |
41 | "login.customServerQuestion": "Using a custom Ferdi server?", | ||
42 | "login.customServerSuggestion": "Try importing your Franz account", | ||
43 | "login.link.password": "Reset password", | 43 | "login.link.password": "Reset password", |
44 | "login.link.signup": "Create a free account", | 44 | "login.link.signup": "Create a free account", |
45 | "login.password.label": "Password", | 45 | "login.password.label": "Password", |
@@ -126,9 +126,9 @@ | |||
126 | "service.errorHandler.text": "{name} has failed to load.", | 126 | "service.errorHandler.text": "{name} has failed to load.", |
127 | "service.webviewLoader.loading": "Loading", | 127 | "service.webviewLoader.loading": "Loading", |
128 | "services.getStarted": "Get started", | 128 | "services.getStarted": "Get started", |
129 | "services.welcome": "Welcome to Ferdi", | ||
130 | "services.login": "Please login to use Ferdi.", | 129 | "services.login": "Please login to use Ferdi.", |
131 | "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.", | 130 | "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.", |
131 | "services.welcome": "Welcome to Ferdi", | ||
132 | "settings.account.account.editButton": "Edit account", | 132 | "settings.account.account.editButton": "Edit account", |
133 | "settings.account.accountType.basic": "Basic Account", | 133 | "settings.account.accountType.basic": "Basic Account", |
134 | "settings.account.accountType.premium": "Premium Supporter Account", | 134 | "settings.account.accountType.premium": "Premium Supporter Account", |
@@ -164,8 +164,8 @@ | |||
164 | "settings.app.form.enableSystemTray": "Show Ferdi in system tray", | 164 | "settings.app.form.enableSystemTray": "Show Ferdi in system tray", |
165 | "settings.app.form.language": "Language", | 165 | "settings.app.form.language": "Language", |
166 | "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray", | 166 | "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray", |
167 | "settings.app.form.server": "Server", | ||
168 | "settings.app.form.runInBackground": "Keep Ferdi in background when closing the window", | 167 | "settings.app.form.runInBackground": "Keep Ferdi in background when closing the window", |
168 | "settings.app.form.server": "Server", | ||
169 | "settings.app.form.showDisabledServices": "Display disabled services tabs", | 169 | "settings.app.form.showDisabledServices": "Display disabled services tabs", |
170 | "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled", | 170 | "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled", |
171 | "settings.app.headline": "Settings", | 171 | "settings.app.headline": "Settings", |