From 9725443e60bc6e147fdc8d195dab048d1d5aa461 Mon Sep 17 00:00:00 2001 From: HJ <30-hj@users.noreply.git.pleroma.social> Date: Sun, 22 May 2022 16:40:59 +0000 Subject: [PATCH] Revert "Merge branch 'revert-a88abc7e' into 'develop'" This reverts merge request !1526 --- package.json | 1 + .../interface_language_switcher.vue | 38 ++++++++++--------- src/components/registration/registration.js | 14 ++++++- src/components/registration/registration.vue | 12 ++++++ .../settings_modal/tabs/general_tab.js | 6 +++ .../settings_modal/tabs/general_tab.vue | 6 ++- .../settings_modal/tabs/profile_tab.js | 38 ++++++++++++------- .../settings_modal/tabs/profile_tab.vue | 7 ++++ src/i18n/en.json | 4 +- src/modules/config.js | 5 +++ src/services/api/api.service.js | 1 + src/services/locale/locale.service.js | 27 ++++++++++++- yarn.lock | 5 +++ 13 files changed, 127 insertions(+), 37 deletions(-) diff --git a/package.json b/package.json index b5ece450..58aeb363 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "cropperjs": "1.5.12", "diff": "3.5.0", "escape-html": "1.0.3", + "js-cookie": "^3.0.1", "localforage": "1.10.0", "parse-link-header": "1.0.1", "phoenix": "1.6.2", diff --git a/src/components/interface_language_switcher/interface_language_switcher.vue b/src/components/interface_language_switcher/interface_language_switcher.vue index 6d1f83c4..7ad1fe2e 100644 --- a/src/components/interface_language_switcher/interface_language_switcher.vue +++ b/src/components/interface_language_switcher/interface_language_switcher.vue @@ -1,12 +1,12 @@