add it-lang/add missing translation fields

Signed-off-by: Andrea Macaro <[email protected]> Signed-off-by: Zoey <[email protected]>
ZoeyVid · Jan 23, 2025 · 74fcf03 · 74fcf03
1 parent ee32f3e
commit 74fcf03
Show file tree

Hide file tree

Showing 10 changed files with 315 additions and 23 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -64,6 +64,7 @@ jobs:
           version="$(cat .version)+$(git rev-parse --short HEAD)"
           sed -i "s|\"0.0.0\"|\"$version\"|g" frontend/js/i18n/en-lang.json
           sed -i "s|\"0.0.0\"|\"$version\"|g" frontend/js/i18n/de-lang.json
+          sed -i "s|\"0.0.0\"|\"$version\"|g" frontend/js/i18n/it-lang.json
           sed -i "s|\"0.0.0\"|\"$version\"|g" frontend/package.json
           sed -i "s|\"0.0.0\"|\"$version\"|g" backend/package.json
       - name: Build

diff --git a/.github/workflows/spellcheck.yml b/.github/workflows/spellcheck.yml
@@ -15,4 +15,4 @@ jobs:
         with:
           check_filenames: true
           check_hidden: true
-          skip: .git,.gitignore,de-lang.json,showdown.min.js,jquery.min.js,xregexp-all.js
+          skip: .git,.gitignore,de-lang.json,it-lang.json,showdown.min.js,jquery.min.js,xregexp-all.js
diff --git a/backend/internal/certificate.js b/backend/internal/certificate.js
@@ -897,7 +897,7 @@ const internalCertificate = {
 		logger.info('Revoking Certbot certificates for Cert #' + certificate.id + ': ' + certificate.domain_names.join(', '));
 
 		return utils
-			.execFile(certbotCommand, [...certbotArgs, 'revoke', '--cert-name', `npm-${certificate.id}`, '--no-delete-after-revoke'])
+			.execFile(certbotCommand, [...certbotArgs, 'revoke', '--cert-name', `npm-${certificate.id}`, '--delete-after-revoke'])
 			.then(async (result) => {
 				logger.info(result);
 				return result;

diff --git a/frontend/js/app/i18n.js b/frontend/js/app/i18n.js
@@ -13,6 +13,10 @@ module.exports = function (namespace, key, data) {
         messages = { ...messages, ...require('../i18n/de-lang.json') };
     }
 
+    if (locale.includes('it')) {
+        messages = { ...messages, ...require('../i18n/it-lang.json') };
+    }
+
     if (typeof messages[namespace] !== 'undefined' && typeof messages[namespace][key] !== 'undefined') {
         return messages[namespace][key](data);
     } else {

diff --git a/frontend/js/app/nginx/access/form.ejs b/frontend/js/app/nginx/access/form.ejs
@@ -46,12 +46,7 @@
 
                 <!-- Authorization -->
                 <div class="tab-pane" id="auth">
-                    <p>
-                        Basic Authorization via
-                        <a target="_blank" href="https://nginx.org/en/docs/http/ngx_http_auth_basic_module.html">
-                            Nginx HTTP Basic Authentication
-                        </a>
-                    </p>
+                    <p><%= i18n('access-lists', 'access-basic', {url: 'https://nginx.org/en/docs/http/ngx_http_auth_basic_module.html'}) %></p>
                     <div class="row">
                         <div class="col-sm-6 col-md-6">
                             <div class="form-group">
@@ -73,12 +68,7 @@
 
                 <!-- Access -->
                 <div class="tab-pane" id="access">
-                    <p>
-                        IP Address Whitelist/Blacklist via
-                        <a target="_blank" href="https://nginx.org/en/docs/http/ngx_http_access_module.html">
-                            Nginx HTTP Access
-                        </a>
-                    </p>
+                    <p><%= i18n('access-lists', 'access-ip', {url: 'https://nginx.org/en/docs/http/ngx_http_access_module.html'}) %></p>
                     <div class="clients"><!-- clients --></div>
                     <div class="row">
                         <div class="col-sm-3 col-md-3">

diff --git a/frontend/js/app/nginx/proxy/form.ejs b/frontend/js/app/nginx/proxy/form.ejs
@@ -259,12 +259,6 @@
                 <div role="tabpanel" class="tab-pane" id="advanced">
                     <div class="row">
                         <div class="col-md-12">
-                            <p><%- i18n('all-hosts', 'advanced-config-var-headline') %></p>
-                            <ul class="text-monospace">
-                                <li><code>$server</code> <%- i18n('proxy-hosts', 'forward-host') %></li>
-                                <li><code>$port</code> <%- i18n('proxy-hosts', 'forward-port') %></li>
-                                <li><code>$forward_scheme</code> <%- i18n('proxy-hosts', 'forward-scheme') %></li>
-                            </ul>
                             <div class="form-group mb-0">
                                 <label class="form-label"><%- i18n('all-hosts', 'advanced-config') %></label>
                                 <textarea name="advanced_config" rows="8" class="form-control text-monospace" placeholder="# <%- i18n('all-hosts', 'advanced-warning') %>"><%- advanced_config %></textarea>

diff --git a/frontend/js/app/ui/footer/main.ejs b/frontend/js/app/ui/footer/main.ejs
@@ -3,7 +3,7 @@
         <div class="row align-items-center">
             <div class="col-auto">
                 <ul class="list-inline list-inline-dots mb-0">
-                    <li class="list-inline-item"><a href="#" onclick="toggleDarkMode()">Toggle Dark Mode</a></li>
+                    <li class="list-inline-item"><a href="#" onclick="toggleDarkMode()"><%- i18n('footer', 'toggle-dark') %></a></li>
                     <li class="list-inline-item"><a href="https://github.com/ZoeyVid/NPMplus" target="_blank"><%- i18n('footer', 'repo') %></a></li>
                 </ul>
             </div>

diff --git a/frontend/js/i18n/de-lang.json b/frontend/js/i18n/de-lang.json
@@ -2,6 +2,8 @@
   "access-lists": {
     "access": "Zugang",
     "access-add": "Hinzufügen",
+    "access-basic": "Basic Authorization via <a href=\"{url}\" target=\"_blank\">Nginx HTTP Basic Authentication</a>",
+    "access-ip": "IP Adressen Whitelist/Blacklist via <a href=\"{url}\" target=\"_blank\">Nginx HTTP Access</a>",
     "add": "Zugangsliste hinzufügen",
     "auth-add": "Hinzufügen",
     "authorization": "Autorisierung",
@@ -115,7 +117,8 @@
     "copy-npmplus": " - und &copy; 2024 <a href=\"{url}\" target=\"_blank\">ZoeyVid</a> NPMplus",
     "license": " - MIT-Lizenz",
     "repo": "Repository auf GitHub",
-    "theme": " - Thema von <a href=\"{url}\" target=\"_blank\">Tabler v0.0.31</a>"
+    "theme": " - Thema von <a href=\"{url}\" target=\"_blank\">Tabler v0.0.31</a>",
+    "toggle-dark": "Dark Modus ein-/ausschalten"
   },
   "locations": {
     "delete": "Löschen",

diff --git a/frontend/js/i18n/en-lang.json b/frontend/js/i18n/en-lang.json
@@ -2,6 +2,8 @@
   "access-lists": {
     "access": "Access",
     "access-add": "Add",
+    "access-basic": "Basic Authorization via <a href=\"{url}\" target=\"_blank\">Nginx HTTP Basic Authentication</a>",
+    "access-ip": "IP Address Whitelist/Blacklist via <a href=\"{url}\" target=\"_blank\">Nginx HTTP Access</a>",
     "add": "Add Access List",
     "auth-add": "Add",
     "authorization": "Authorization",
@@ -115,7 +117,8 @@
     "copy-npmplus": " - and &copy; 2024 <a href=\"{url}\" target=\"_blank\">ZoeyVid</a> NPMplus",
     "license": " - MIT-License",
     "repo": "Repository on GitHub",
-    "theme": " - Theme by <a href=\"{url}\" target=\"_blank\">Tabler v0.0.31</a>"
+    "theme": " - Theme by <a href=\"{url}\" target=\"_blank\">Tabler v0.0.31</a>",
+    "toggle-dark": "Toggle Dark Mode"
   },
   "locations": {
     "delete": "Delete",