From bc534c12a572985aa13d56580f9639bf8b686758 Mon Sep 17 00:00:00 2001 From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com> Date: Mon, 28 Aug 2023 00:49:14 +0100 Subject: [PATCH 1/2] login page lang changes --- src/main/resources/static/js/darkmode.js | 2 + .../templates/fragments/langAndDarkMode.html | 75 ------ .../templates/fragments/languages.html | 56 +++++ .../resources/templates/fragments/navbar.html | 22 +- src/main/resources/templates/login.html | 215 +++++++++++++++++- 5 files changed, 283 insertions(+), 87 deletions(-) delete mode 100644 src/main/resources/templates/fragments/langAndDarkMode.html create mode 100644 src/main/resources/templates/fragments/languages.html diff --git a/src/main/resources/static/js/darkmode.js b/src/main/resources/static/js/darkmode.js index fe239583..ebf9c683 100644 --- a/src/main/resources/static/js/darkmode.js +++ b/src/main/resources/static/js/darkmode.js @@ -16,6 +16,8 @@ function getElements() { } function setMode(mode) { + var event = new CustomEvent('modeChanged', { detail: mode }); + document.dispatchEvent(event); elements.lightModeStyles.disabled = mode !== "off"; elements.darkModeStyles.disabled = mode !== "on"; elements.rainbowModeStyles.disabled = mode !== "rainbow"; diff --git a/src/main/resources/templates/fragments/langAndDarkMode.html b/src/main/resources/templates/fragments/langAndDarkMode.html deleted file mode 100644 index 8c6b0ea3..00000000 --- a/src/main/resources/templates/fragments/langAndDarkMode.html +++ /dev/null @@ -1,75 +0,0 @@ - - - - - -
  • - - icon - -
    • - -
  • - -
    - - icon العربية - - - icon Català - - - icon 简体中文 - - - icon Deutsch - - - icon English (GB) - - - icon English (US) - - - icon Euskara - - - icon Español - - - icon Français - - - icon Italiano - - - icon Nederlands - - - icon Polski - - - icon Português (BR) - - - icon Romanian - - - icon Svenska - - - icon Русский - - - icon 한국어 - - - icon 日本語 - -
    -
    • -     \ No newline at end of file diff --git a/src/main/resources/templates/fragments/languages.html b/src/main/resources/templates/fragments/languages.html new file mode 100644 index 00000000..17b88660 --- /dev/null +++ b/src/main/resources/templates/fragments/languages.html @@ -0,0 +1,56 @@ + + + icon العربية + + + icon Català + + + icon 简体中文 + + + icon Deutsch + + + icon English (GB) + + + icon English (US) + + + icon Euskara + + + icon Español + + + icon Français + + + icon Italiano + + + icon Nederlands + + + icon Polski + + + icon Português (BR) + + + icon Romanian + + + icon Svenska + + + icon Русский + + + icon 한국어 + + + icon 日本語 + + \ No newline at end of file diff --git a/src/main/resources/templates/fragments/navbar.html b/src/main/resources/templates/fragments/navbar.html index 009445e8..4326afcc 100644 --- a/src/main/resources/templates/fragments/navbar.html +++ b/src/main/resources/templates/fragments/navbar.html @@ -147,7 +147,27 @@ - + + + + + +
  • + + icon + +
    • + +
  • + +
    + +
    +
  • diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html index be819cd4..7a9f4aa0 100644 --- a/src/main/resources/templates/login.html +++ b/src/main/resources/templates/login.html @@ -1,6 +1,7 @@ + +
    +
    + +
    -

    Stirling-PDF

    -

    Please sign in

    +

    Stirling-PDF

    +

    Please sign in

    - +
    - +
    -
    -
    +
    +
    + +
    + + +
    +
    +
    + + +
    -
    Invalid username or +
    Invalid username or password.
    -
    Your account has been locked. +
    Your account has been locked.
    From 6409274f8346b5e37f9e54ab14b28960a7b3013e Mon Sep 17 00:00:00 2001 From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com> Date: Mon, 28 Aug 2023 10:17:02 +0100 Subject: [PATCH 2/2] language stuff --- src/main/resources/messages_ar_AR.properties | 14 +++++++--- src/main/resources/messages_ca_CA.properties | 14 +++++++--- src/main/resources/messages_de_DE.properties | 14 +++++++--- src/main/resources/messages_en_GB.properties | 9 ++++++ src/main/resources/messages_en_US.properties | 14 +++++++--- src/main/resources/messages_es_ES.properties | 14 +++++++--- src/main/resources/messages_eu_ES.properties | 14 +++++++--- src/main/resources/messages_fr_FR.properties | 14 +++++++--- src/main/resources/messages_it_IT.properties | 14 +++++++--- src/main/resources/messages_ja_JP.properties | 14 +++++++--- src/main/resources/messages_ko_KR.properties | 14 +++++++--- src/main/resources/messages_nl_NL.properties | 14 +++++++--- src/main/resources/messages_pl_PL.properties | 14 +++++++--- src/main/resources/messages_pt_BR.properties | 14 +++++++--- src/main/resources/messages_ro_RO.properties | 14 +++++++--- src/main/resources/messages_ru_RU.properties | 14 +++++++--- src/main/resources/messages_sv_SE.properties | 14 +++++++--- src/main/resources/messages_zh_CN.properties | 14 +++++++--- .../resources/static/js/languageSelection.js | 16 +++++++++++ src/main/resources/templates/login.html | 28 ++++++++++++++++--- 20 files changed, 219 insertions(+), 72 deletions(-) diff --git a/src/main/resources/messages_ar_AR.properties b/src/main/resources/messages_ar_AR.properties index 9d6a0a71..290cec4c 100644 --- a/src/main/resources/messages_ar_AR.properties +++ b/src/main/resources/messages_ar_AR.properties @@ -299,9 +299,6 @@ home.showJS.title=Show Javascript home.showJS.desc=Searches and displays any JS injected into a PDF showJS.tags=JS -########################## -### TODO: Translate ### -########################## home.autoRedact.title=Auto Redact home.autoRedact.desc=Auto Redacts(Blacks out) text in a PDF based on input text showJS.tags=JS @@ -311,10 +308,19 @@ showJS.tags=JS # WEB PAGES # # # ########################### -#auto-redact +#login ########################## ### TODO: Translate ### ########################## +login.title=Sign in +login.signin=Sign in +login.rememberme=Remember me +login.invalid=Invalid username or password. +login.locked=Your account has been locked. +login.signinTitle=Please sign in + + +#auto-redact autoRedact.title=Auto Redact autoRedact.header=Auto Redact autoRedact.textsToRedactLabel=Text to Redact (line-separated) diff --git a/src/main/resources/messages_ca_CA.properties b/src/main/resources/messages_ca_CA.properties index 99725d38..99075d55 100644 --- a/src/main/resources/messages_ca_CA.properties +++ b/src/main/resources/messages_ca_CA.properties @@ -299,9 +299,6 @@ home.showJS.title=Show Javascript home.showJS.desc=Searches and displays any JS injected into a PDF showJS.tags=JS -########################## -### TODO: Translate ### -########################## home.autoRedact.title=Auto Redact home.autoRedact.desc=Auto Redacts(Blacks out) text in a PDF based on input text showJS.tags=JS @@ -311,10 +308,19 @@ showJS.tags=JS # WEB PAGES # # # ########################### -#auto-redact +#login ########################## ### TODO: Translate ### ########################## +login.title=Sign in +login.signin=Sign in +login.rememberme=Remember me +login.invalid=Invalid username or password. +login.locked=Your account has been locked. +login.signinTitle=Please sign in + + +#auto-redact autoRedact.title=Auto Redact autoRedact.header=Auto Redact autoRedact.textsToRedactLabel=Text to Redact (line-separated) diff --git a/src/main/resources/messages_de_DE.properties b/src/main/resources/messages_de_DE.properties index e1e31632..43c24f65 100644 --- a/src/main/resources/messages_de_DE.properties +++ b/src/main/resources/messages_de_DE.properties @@ -299,9 +299,6 @@ home.showJS.title=Show Javascript home.showJS.desc=Searches and displays any JS injected into a PDF showJS.tags=JS -########################## -### TODO: Translate ### -########################## home.autoRedact.title=Auto Redact home.autoRedact.desc=Auto Redacts(Blacks out) text in a PDF based on input text showJS.tags=JS @@ -311,10 +308,19 @@ showJS.tags=JS # WEB PAGES # # # ########################### -#auto-redact +#login ########################## ### TODO: Translate ### ########################## +login.title=Sign in +login.signin=Sign in +login.rememberme=Remember me +login.invalid=Invalid username or password. +login.locked=Your account has been locked. +login.signinTitle=Please sign in + + +#auto-redact autoRedact.title=Auto Redact autoRedact.header=Auto Redact autoRedact.textsToRedactLabel=Text to Redact (line-separated) diff --git a/src/main/resources/messages_en_GB.properties b/src/main/resources/messages_en_GB.properties index d1abe2d4..05a4bd91 100644 --- a/src/main/resources/messages_en_GB.properties +++ b/src/main/resources/messages_en_GB.properties @@ -308,6 +308,15 @@ showJS.tags=Redact,Hide,black out,black,marker,hidden # WEB PAGES # # # ########################### +#login +login.title=Sign in +login.signin=Sign in +login.rememberme=Remember me +login.invalid=Invalid username or password. +login.locked=Your account has been locked. +login.signinTitle=Please sign in + + #auto-redact autoRedact.title=Auto Redact autoRedact.header=Auto Redact diff --git a/src/main/resources/messages_en_US.properties b/src/main/resources/messages_en_US.properties index 96f082ff..dc7c93f8 100644 --- a/src/main/resources/messages_en_US.properties +++ b/src/main/resources/messages_en_US.properties @@ -299,9 +299,6 @@ home.showJS.title=Show Javascript home.showJS.desc=Searches and displays any JS injected into a PDF showJS.tags=JS -########################## -### TODO: Translate ### -########################## home.autoRedact.title=Auto Redact home.autoRedact.desc=Auto Redacts(Blacks out) text in a PDF based on input text showJS.tags=JS @@ -311,10 +308,19 @@ showJS.tags=JS # WEB PAGES # # # ########################### -#auto-redact +#login ########################## ### TODO: Translate ### ########################## +login.title=Sign in +login.signin=Sign in +login.rememberme=Remember me +login.invalid=Invalid username or password. +login.locked=Your account has been locked. +login.signinTitle=Please sign in + + +#auto-redact autoRedact.title=Auto Redact autoRedact.header=Auto Redact autoRedact.textsToRedactLabel=Text to Redact (line-separated) diff --git a/src/main/resources/messages_es_ES.properties b/src/main/resources/messages_es_ES.properties index 73e2c53e..8ece9c78 100644 --- a/src/main/resources/messages_es_ES.properties +++ b/src/main/resources/messages_es_ES.properties @@ -299,9 +299,6 @@ home.showJS.title=Show Javascript home.showJS.desc=Searches and displays any JS injected into a PDF showJS.tags=JS -########################## -### TODO: Translate ### -########################## home.autoRedact.title=Auto Redact home.autoRedact.desc=Auto Redacts(Blacks out) text in a PDF based on input text showJS.tags=JS @@ -311,10 +308,19 @@ showJS.tags=JS # WEB PAGES # # # ########################### -#auto-redact +#login ########################## ### TODO: Translate ### ########################## +login.title=Sign in +login.signin=Sign in +login.rememberme=Remember me +login.invalid=Invalid username or password. +login.locked=Your account has been locked. +login.signinTitle=Please sign in + + +#auto-redact autoRedact.title=Auto Redact autoRedact.header=Auto Redact autoRedact.textsToRedactLabel=Text to Redact (line-separated) diff --git a/src/main/resources/messages_eu_ES.properties b/src/main/resources/messages_eu_ES.properties index 554bfad2..75edb5a4 100644 --- a/src/main/resources/messages_eu_ES.properties +++ b/src/main/resources/messages_eu_ES.properties @@ -299,9 +299,6 @@ home.showJS.title=Show Javascript home.showJS.desc=Searches and displays any JS injected into a PDF showJS.tags=JS -########################## -### TODO: Translate ### -########################## home.autoRedact.title=Auto Redact home.autoRedact.desc=Auto Redacts(Blacks out) text in a PDF based on input text showJS.tags=JS @@ -311,10 +308,19 @@ showJS.tags=JS # WEB PAGES # # # ########################### -#auto-redact +#login ########################## ### TODO: Translate ### ########################## +login.title=Sign in +login.signin=Sign in +login.rememberme=Remember me +login.invalid=Invalid username or password. +login.locked=Your account has been locked. +login.signinTitle=Please sign in + + +#auto-redact autoRedact.title=Auto Redact autoRedact.header=Auto Redact autoRedact.textsToRedactLabel=Text to Redact (line-separated) diff --git a/src/main/resources/messages_fr_FR.properties b/src/main/resources/messages_fr_FR.properties index 1f3bcc2c..dad35713 100644 --- a/src/main/resources/messages_fr_FR.properties +++ b/src/main/resources/messages_fr_FR.properties @@ -299,9 +299,6 @@ home.showJS.title=Afficher le JavaScript home.showJS.desc=Recherche et affiche tout JavaScript injecté dans un PDF. showJS.tags=afficher,javascript,js -########################## -### TODO: Translate ### -########################## home.autoRedact.title=Auto Redact home.autoRedact.desc=Auto Redacts(Blacks out) text in a PDF based on input text showJS.tags=afficher,javascript,js @@ -311,10 +308,19 @@ showJS.tags=afficher,javascript,js # WEB PAGES # # # ########################### -#auto-redact +#login ########################## ### TODO: Translate ### ########################## +login.title=Sign in +login.signin=Sign in +login.rememberme=Remember me +login.invalid=Invalid username or password. +login.locked=Your account has been locked. +login.signinTitle=Please sign in + + +#auto-redact autoRedact.title=Auto Redact autoRedact.header=Auto Redact autoRedact.textsToRedactLabel=Text to Redact (line-separated) diff --git a/src/main/resources/messages_it_IT.properties b/src/main/resources/messages_it_IT.properties index aed51bb0..0f150f8c 100644 --- a/src/main/resources/messages_it_IT.properties +++ b/src/main/resources/messages_it_IT.properties @@ -299,9 +299,6 @@ home.showJS.title=Show Javascript home.showJS.desc=Searches and displays any JS injected into a PDF showJS.tags=JS -########################## -### TODO: Translate ### -########################## home.autoRedact.title=Auto Redact home.autoRedact.desc=Auto Redacts(Blacks out) text in a PDF based on input text showJS.tags=JS @@ -311,10 +308,19 @@ showJS.tags=JS # WEB PAGES # # # ########################### -#auto-redact +#login ########################## ### TODO: Translate ### ########################## +login.title=Sign in +login.signin=Sign in +login.rememberme=Remember me +login.invalid=Invalid username or password. +login.locked=Your account has been locked. +login.signinTitle=Please sign in + + +#auto-redact autoRedact.title=Auto Redact autoRedact.header=Auto Redact autoRedact.textsToRedactLabel=Text to Redact (line-separated) diff --git a/src/main/resources/messages_ja_JP.properties b/src/main/resources/messages_ja_JP.properties index b9e2506a..46a45d48 100644 --- a/src/main/resources/messages_ja_JP.properties +++ b/src/main/resources/messages_ja_JP.properties @@ -299,9 +299,6 @@ home.showJS.title=Show Javascript home.showJS.desc=Searches and displays any JS injected into a PDF showJS.tags=JS -########################## -### TODO: Translate ### -########################## home.autoRedact.title=Auto Redact home.autoRedact.desc=Auto Redacts(Blacks out) text in a PDF based on input text showJS.tags=JS @@ -311,10 +308,19 @@ showJS.tags=JS # WEB PAGES # # # ########################### -#auto-redact +#login ########################## ### TODO: Translate ### ########################## +login.title=Sign in +login.signin=Sign in +login.rememberme=Remember me +login.invalid=Invalid username or password. +login.locked=Your account has been locked. +login.signinTitle=Please sign in + + +#auto-redact autoRedact.title=Auto Redact autoRedact.header=Auto Redact autoRedact.textsToRedactLabel=Text to Redact (line-separated) diff --git a/src/main/resources/messages_ko_KR.properties b/src/main/resources/messages_ko_KR.properties index 5b5fbd48..50a8a7d0 100644 --- a/src/main/resources/messages_ko_KR.properties +++ b/src/main/resources/messages_ko_KR.properties @@ -299,9 +299,6 @@ home.showJS.title=Show Javascript home.showJS.desc=Searches and displays any JS injected into a PDF showJS.tags=JS -########################## -### TODO: Translate ### -########################## home.autoRedact.title=Auto Redact home.autoRedact.desc=Auto Redacts(Blacks out) text in a PDF based on input text showJS.tags=JS @@ -311,10 +308,19 @@ showJS.tags=JS # WEB PAGES # # # ########################### -#auto-redact +#login ########################## ### TODO: Translate ### ########################## +login.title=Sign in +login.signin=Sign in +login.rememberme=Remember me +login.invalid=Invalid username or password. +login.locked=Your account has been locked. +login.signinTitle=Please sign in + + +#auto-redact autoRedact.title=Auto Redact autoRedact.header=Auto Redact autoRedact.textsToRedactLabel=Text to Redact (line-separated) diff --git a/src/main/resources/messages_nl_NL.properties b/src/main/resources/messages_nl_NL.properties index e3953ed3..331ecd89 100644 --- a/src/main/resources/messages_nl_NL.properties +++ b/src/main/resources/messages_nl_NL.properties @@ -299,9 +299,6 @@ home.showJS.title=Toon Javascript home.showJS.desc=Zoekt en toont ieder script dat in een PDF is geïnjecteerd showJS.tags=JS -########################## -### TODO: Translate ### -########################## home.autoRedact.title=Auto Redact home.autoRedact.desc=Auto Redacts(Blacks out) text in a PDF based on input text showJS.tags=JS @@ -311,10 +308,19 @@ showJS.tags=JS # WEB PAGES # # # ########################### -#auto-redact +#login ########################## ### TODO: Translate ### ########################## +login.title=Sign in +login.signin=Sign in +login.rememberme=Remember me +login.invalid=Invalid username or password. +login.locked=Your account has been locked. +login.signinTitle=Please sign in + + +#auto-redact autoRedact.title=Auto Redact autoRedact.header=Auto Redact autoRedact.textsToRedactLabel=Text to Redact (line-separated) diff --git a/src/main/resources/messages_pl_PL.properties b/src/main/resources/messages_pl_PL.properties index 7cd0d36c..bac7aa5f 100644 --- a/src/main/resources/messages_pl_PL.properties +++ b/src/main/resources/messages_pl_PL.properties @@ -299,9 +299,6 @@ home.showJS.title=Show Javascript home.showJS.desc=Searches and displays any JS injected into a PDF showJS.tags=JS -########################## -### TODO: Translate ### -########################## home.autoRedact.title=Auto Redact home.autoRedact.desc=Auto Redacts(Blacks out) text in a PDF based on input text showJS.tags=JS @@ -311,10 +308,19 @@ showJS.tags=JS # WEB PAGES # # # ########################### -#auto-redact +#login ########################## ### TODO: Translate ### ########################## +login.title=Sign in +login.signin=Sign in +login.rememberme=Remember me +login.invalid=Invalid username or password. +login.locked=Your account has been locked. +login.signinTitle=Please sign in + + +#auto-redact autoRedact.title=Auto Redact autoRedact.header=Auto Redact autoRedact.textsToRedactLabel=Text to Redact (line-separated) diff --git a/src/main/resources/messages_pt_BR.properties b/src/main/resources/messages_pt_BR.properties index c9b1807d..3a89624e 100644 --- a/src/main/resources/messages_pt_BR.properties +++ b/src/main/resources/messages_pt_BR.properties @@ -299,9 +299,6 @@ home.showJS.title=Mostrar Javascript home.showJS.desc=Procura e exibe qualquer JavaScript injetado em um PDF showJS.tags=JavaScript -########################## -### TODO: Translate ### -########################## home.autoRedact.title=Auto Redact home.autoRedact.desc=Auto Redacts(Blacks out) text in a PDF based on input text showJS.tags=JavaScript @@ -311,10 +308,19 @@ showJS.tags=JavaScript # WEB PAGES # # # ########################### -#auto-redact +#login ########################## ### TODO: Translate ### ########################## +login.title=Sign in +login.signin=Sign in +login.rememberme=Remember me +login.invalid=Invalid username or password. +login.locked=Your account has been locked. +login.signinTitle=Please sign in + + +#auto-redact autoRedact.title=Auto Redact autoRedact.header=Auto Redact autoRedact.textsToRedactLabel=Text to Redact (line-separated) diff --git a/src/main/resources/messages_ro_RO.properties b/src/main/resources/messages_ro_RO.properties index 9a49a2ff..bc038897 100644 --- a/src/main/resources/messages_ro_RO.properties +++ b/src/main/resources/messages_ro_RO.properties @@ -299,9 +299,6 @@ home.showJS.title=Show Javascript home.showJS.desc=Searches and displays any JS injected into a PDF showJS.tags=JS -########################## -### TODO: Translate ### -########################## home.autoRedact.title=Auto Redact home.autoRedact.desc=Auto Redacts(Blacks out) text in a PDF based on input text showJS.tags=JS @@ -311,10 +308,19 @@ showJS.tags=JS # WEB PAGES # # # ########################### -#auto-redact +#login ########################## ### TODO: Translate ### ########################## +login.title=Sign in +login.signin=Sign in +login.rememberme=Remember me +login.invalid=Invalid username or password. +login.locked=Your account has been locked. +login.signinTitle=Please sign in + + +#auto-redact autoRedact.title=Auto Redact autoRedact.header=Auto Redact autoRedact.textsToRedactLabel=Text to Redact (line-separated) diff --git a/src/main/resources/messages_ru_RU.properties b/src/main/resources/messages_ru_RU.properties index 869a74b8..7e4121ee 100644 --- a/src/main/resources/messages_ru_RU.properties +++ b/src/main/resources/messages_ru_RU.properties @@ -299,9 +299,6 @@ home.showJS.title=Show Javascript home.showJS.desc=Searches and displays any JS injected into a PDF showJS.tags=JS -########################## -### TODO: Translate ### -########################## home.autoRedact.title=Auto Redact home.autoRedact.desc=Auto Redacts(Blacks out) text in a PDF based on input text showJS.tags=JS @@ -311,10 +308,19 @@ showJS.tags=JS # WEB PAGES # # # ########################### -#auto-redact +#login ########################## ### TODO: Translate ### ########################## +login.title=Sign in +login.signin=Sign in +login.rememberme=Remember me +login.invalid=Invalid username or password. +login.locked=Your account has been locked. +login.signinTitle=Please sign in + + +#auto-redact autoRedact.title=Auto Redact autoRedact.header=Auto Redact autoRedact.textsToRedactLabel=Text to Redact (line-separated) diff --git a/src/main/resources/messages_sv_SE.properties b/src/main/resources/messages_sv_SE.properties index 769c3d9b..139c9ca2 100644 --- a/src/main/resources/messages_sv_SE.properties +++ b/src/main/resources/messages_sv_SE.properties @@ -299,9 +299,6 @@ home.showJS.title=Show Javascript home.showJS.desc=Searches and displays any JS injected into a PDF showJS.tags=JS -########################## -### TODO: Translate ### -########################## home.autoRedact.title=Auto Redact home.autoRedact.desc=Auto Redacts(Blacks out) text in a PDF based on input text showJS.tags=JS @@ -311,10 +308,19 @@ showJS.tags=JS # WEB PAGES # # # ########################### -#auto-redact +#login ########################## ### TODO: Translate ### ########################## +login.title=Sign in +login.signin=Sign in +login.rememberme=Remember me +login.invalid=Invalid username or password. +login.locked=Your account has been locked. +login.signinTitle=Please sign in + + +#auto-redact autoRedact.title=Auto Redact autoRedact.header=Auto Redact autoRedact.textsToRedactLabel=Text to Redact (line-separated) diff --git a/src/main/resources/messages_zh_CN.properties b/src/main/resources/messages_zh_CN.properties index 6cb2ef35..3bfdab32 100644 --- a/src/main/resources/messages_zh_CN.properties +++ b/src/main/resources/messages_zh_CN.properties @@ -299,9 +299,6 @@ home.showJS.title=Show Javascript home.showJS.desc=Searches and displays any JS injected into a PDF showJS.tags=JS -########################## -### TODO: Translate ### -########################## home.autoRedact.title=Auto Redact home.autoRedact.desc=Auto Redacts(Blacks out) text in a PDF based on input text showJS.tags=JS @@ -311,10 +308,19 @@ showJS.tags=JS # WEB PAGES # # # ########################### -#auto-redact +#login ########################## ### TODO: Translate ### ########################## +login.title=Sign in +login.signin=Sign in +login.rememberme=Remember me +login.invalid=Invalid username or password. +login.locked=Your account has been locked. +login.signinTitle=Please sign in + + +#auto-redact autoRedact.title=Auto Redact autoRedact.header=Auto Redact autoRedact.textsToRedactLabel=Text to Redact (line-separated) diff --git a/src/main/resources/static/js/languageSelection.js b/src/main/resources/static/js/languageSelection.js index 3da819b3..c554c2a7 100644 --- a/src/main/resources/static/js/languageSelection.js +++ b/src/main/resources/static/js/languageSelection.js @@ -1,4 +1,5 @@ document.addEventListener('DOMContentLoaded', function() { + setLanguageForDropdown('.lang_dropdown-item'); const defaultLocale = document.documentElement.lang || 'en_GB'; const storedLocale = localStorage.getItem('languageCode') || defaultLocale; const dropdownItems = document.querySelectorAll('.lang_dropdown-item'); @@ -13,6 +14,21 @@ document.addEventListener('DOMContentLoaded', function() { } }); +function setLanguageForDropdown(dropdownClass) { + const defaultLocale = document.documentElement.lang || 'en_GB'; + const storedLocale = localStorage.getItem('languageCode') || defaultLocale; + const dropdownItems = document.querySelectorAll(dropdownClass); + + for (let i = 0; i < dropdownItems.length; i++) { + const item = dropdownItems[i]; + item.classList.remove('active'); + if (item.dataset.languageCode === storedLocale) { + item.classList.add('active'); + } + item.addEventListener('click', handleDropdownItemClick); + } +} + function handleDropdownItemClick(event) { event.preventDefault(); const languageCode = event.currentTarget.dataset.bsLanguageCode; // change this to event.currentTarget diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html index 7a9f4aa0..1ddea6ec 100644 --- a/src/main/resources/templates/login.html +++ b/src/main/resources/templates/login.html @@ -1,4 +1,5 @@ - + + @@ -170,9 +171,28 @@ document.addEventListener('modeChanged', function(e) { }); document.addEventListener('DOMContentLoaded', function() { - const dropdown = document.getElementById('languageDropdown'); - const defaultLocale = document.documentElement.lang || 'en_GB'; + + const defaultLocale = document.documentElement.lang || 'en_GB'; const storedLocale = localStorage.getItem('languageCode') || defaultLocale; + + const currentURL = new URL(window.location.href); + const urlParams = currentURL.searchParams; + const currentLangParam = urlParams.get('lang') || defaultLocale; + + console.log("defaultLocale", defaultLocale) + console.log("storedLocale", storedLocale) + console.log("currentLangParam", currentLangParam) + + if (currentLangParam !== storedLocale) { + urlParams.set('lang', storedLocale); + currentURL.search = urlParams.toString(); + + console.log("redirecting to", currentURL.toString()); + window.location.href = currentURL.toString(); + return; + } + + const dropdown = document.getElementById('languageDropdown'); const dropdownItems = document.querySelectorAll('.lang_dropdown-item'); let activeItem; @@ -241,7 +261,7 @@ function handleDropdownItemClick(event) {

    Stirling-PDF

    -

    Please sign in

    +

    Please sign in