Skip to content
Snippets Groups Projects
Commit 803edcb5 authored by HJ's avatar HJ :fire:
Browse files

dismiss warning when loading theme

parent 1191207a
No related branches found
No related tags found
2 merge requests!1074Update master with 2.0.0,!1037Themes v3 Part 1 "2.1" codenamed "One step for themes, a giant burder for code reviewers"
......@@ -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 {
......
......@@ -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.",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment