aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHenry Jameson <me@hjkos.com>2020-01-22 01:28:05 +0200
committerHenry Jameson <me@hjkos.com>2020-01-22 01:28:17 +0200
commit803edcb53a664382f9db9a00ccebe8efee1873ef (patch)
tree11ded0aab105c0b321f227acf41745109ab3ae29
parent1191207aa5a32627e54f7febcd279d50d03c66b3 (diff)
dismiss warning when loading theme
-rw-r--r--src/components/style_switcher/style_switcher.js3
-rw-r--r--src/i18n/en.json1
2 files changed, 3 insertions, 1 deletions
diff --git a/src/components/style_switcher/style_switcher.js b/src/components/style_switcher/style_switcher.js
index 8f0de067..44e7595d 100644
--- a/src/components/style_switcher/style_switcher.js
+++ b/src/components/style_switcher/style_switcher.js
@@ -162,7 +162,7 @@ export default {
} else if (origin === 'localStorage') {
// FE upgraded from v2
if (themeEngineVersion === 2) {
- return 'upgraded_from_v2'
+ return t(pre + 'upgraded_from_v2')
}
// Admin downgraded FE
if (themeEngineVersion > CURRENT_VERSION) {
@@ -426,6 +426,7 @@ export default {
this.onImport(this.tempImportFile, true)
break
}
+ this.dismissWarning()
},
loadThemeFromLocalStorage (confirmLoadSource = false) {
const {
diff --git a/src/i18n/en.json b/src/i18n/en.json
index d53fa697..815c11b1 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -399,6 +399,7 @@
"load_theme": "Load theme",
"use_snapshot": "Keep as is",
"help": {
+ "upgraded_from_v2": "PleromaFE has been upgraded, theme could look a little bit different than you remember.",
"v2_imported": "File you imported was made for older FE. We try to maximize compatibility but there still could be inconsitencies.",
"future_version_imported": "File you imported was made in newer version of FE.",
"older_version_imported": "File you imported was made in older version of FE.",