Skip to content

Commit e6638f9

Browse files
sledgehammer999sledgehammer999
committed
Revert "Use client side translation for public login page"
This reverts commit ac91c13.
1 parent ec6eac2 commit e6638f9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+4
-556
lines changed

‎.pre-commit-config.yaml

+2-10
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,7 @@ repos:
7878
m4/.* |
7979
src/base/3rdparty/.* |
8080
src/searchengine/nova3/socks.py |
81-
src/webui/www/private/lang/.* |
82-
src/webui/www/private/scripts/lib/.* |
83-
src/webui/www/public/lang/.* |
84-
src/webui/www/public/scripts/lib/.* |
85-
src/webui/www/transifex/.*
81+
src/webui/www/private/scripts/lib/.*
8682
)$
8783
exclude_types:
8884
- ts
@@ -106,11 +102,7 @@ repos:
106102
m4/.* |
107103
src/base/3rdparty/.* |
108104
src/searchengine/nova3/socks.py |
109-
src/webui/www/private/lang/.* |
110-
src/webui/www/private/scripts/lib/.* |
111-
src/webui/www/public/lang/.* |
112-
src/webui/www/public/scripts/lib/.* |
113-
src/webui/www/transifex/.*
105+
src/webui/www/private/scripts/lib/.*
114106
)$
115107
exclude_types:
116108
- svg

‎.tx/config

-8
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,6 @@ type = QT
1717
minimum_perc = 23
1818
lang_map = pt: pt_PT, zh: zh_CN
1919

20-
[o:sledgehammer999:p:qbittorrent:r:qbittorrent_webui_json]
21-
file_filter = src/webui/www/transifex/<lang>.json
22-
source_file = src/webui/www/transifex/en.json
23-
source_lang = en
24-
type = KEYVALUEJSON
25-
minimum_perc = 23
26-
lang_map = pt: pt_PT, zh: zh_CN
27-
2820
[o:sledgehammer999:p:qbittorrent:r:qbittorrentdesktop_master]
2921
source_file = dist/unix/org.qbittorrent.qBittorrent.desktop
3022
source_lang = en

‎src/webui/www/package.json

-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
"url": "https://github.com/qbittorrent/qBittorrent.git"
77
},
88
"scripts": {
9-
"extract_translation": "i18next -c public/i18next-parser.config.mjs public/index.html public/scripts/login.js",
109
"format": "js-beautify -r private/*.html private/scripts/*.js private/views/*.html public/*.html public/scripts/*.js && prettier --write **.css",
1110
"lint": "eslint private/*.html private/scripts/*.js private/views/*.html public/*.html public/scripts/*.js && stylelint **/*.css && html-validate private public"
1211
},
@@ -16,7 +15,6 @@
1615
"eslint-plugin-html": "*",
1716
"eslint-plugin-regexp": "*",
1817
"html-validate": "*",
19-
"i18next-parser": "*",
2018
"js-beautify": "*",
2119
"prettier": "*",
2220
"stylelint": "*",

‎src/webui/www/public/i18next-parser.config.mjs

-10
This file was deleted.

‎src/webui/www/public/index.html

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!DOCTYPE html>
2-
<html lang="en">
2+
<html lang="${LANG}">
33

44
<head>
55
<meta charset="UTF-8" />
@@ -16,8 +16,7 @@
1616
<link rel="stylesheet" type="text/css" href="css/noscript.css?v=${CACHEID}" />
1717
</noscript>
1818

19-
<script defer src="scripts/lib/i18next.min.js"></script>
20-
<script defer src="scripts/login.js?v=${CACHEID}"></script>
19+
<script defer src="scripts/login.js?locale=${LANG}&v=${CACHEID}"></script>
2120
</head>
2221

2322
<body>

‎src/webui/www/public/lang/ar.json

-7
This file was deleted.

‎src/webui/www/public/lang/[email protected]

-7
This file was deleted.

‎src/webui/www/public/lang/be.json

-7
This file was deleted.

‎src/webui/www/public/lang/bg.json

-7
This file was deleted.

‎src/webui/www/public/lang/ca.json

-7
This file was deleted.

‎src/webui/www/public/lang/cs.json

-7
This file was deleted.

‎src/webui/www/public/lang/da.json

-7
This file was deleted.

‎src/webui/www/public/lang/de.json

-7
This file was deleted.

‎src/webui/www/public/lang/el.json

-7
This file was deleted.

‎src/webui/www/public/lang/en.json

-7
This file was deleted.

‎src/webui/www/public/lang/en_AU.json

-7
This file was deleted.

‎src/webui/www/public/lang/en_GB.json

-7
This file was deleted.

‎src/webui/www/public/lang/eo.json

-7
This file was deleted.

‎src/webui/www/public/lang/es.json

-7
This file was deleted.

‎src/webui/www/public/lang/et.json

-7
This file was deleted.

‎src/webui/www/public/lang/eu.json

-7
This file was deleted.

‎src/webui/www/public/lang/fa.json

-7
This file was deleted.

‎src/webui/www/public/lang/fi.json

-7
This file was deleted.

‎src/webui/www/public/lang/fr.json

-7
This file was deleted.

‎src/webui/www/public/lang/gl.json

-7
This file was deleted.

‎src/webui/www/public/lang/he.json

-7
This file was deleted.

‎src/webui/www/public/lang/hi_IN.json

-7
This file was deleted.

‎src/webui/www/public/lang/hr.json

-7
This file was deleted.

‎src/webui/www/public/lang/hu.json

-7
This file was deleted.

‎src/webui/www/public/lang/hy.json

-7
This file was deleted.

‎src/webui/www/public/lang/id.json

-7
This file was deleted.

‎src/webui/www/public/lang/is.json

-7
This file was deleted.

‎src/webui/www/public/lang/it.json

-7
This file was deleted.

‎src/webui/www/public/lang/ja.json

-7
This file was deleted.

‎src/webui/www/public/lang/ka.json

-7
This file was deleted.

‎src/webui/www/public/lang/ko.json

-7
This file was deleted.

‎src/webui/www/public/lang/lt.json

-7
This file was deleted.

‎src/webui/www/public/lang/ltg.json

-7
This file was deleted.

‎src/webui/www/public/lang/lv_LV.json

-7
This file was deleted.

‎src/webui/www/public/lang/mn_MN.json

-7
This file was deleted.

‎src/webui/www/public/lang/ms_MY.json

-7
This file was deleted.

‎src/webui/www/public/lang/nb.json

-7
This file was deleted.

‎src/webui/www/public/lang/nl.json

-7
This file was deleted.

‎src/webui/www/public/lang/oc.json

-7
This file was deleted.

0 commit comments

Comments
 (0)