From a9a7af414873c4212711363c25b554ee20938e0f Mon Sep 17 00:00:00 2001 From: Flat Date: Sun, 3 Jul 2016 14:10:17 +0900 Subject: [PATCH 01/14] Don't translate those which shouldn't be translated `those` are - Numbers - Already translated texts - User names - Network interfaces --- web/templates/admin/list_ip.html | 6 +++--- web/templates/admin/list_packages.html | 6 +++--- web/templates/admin/list_updates.html | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/web/templates/admin/list_ip.html b/web/templates/admin/list_ip.html index ada609a2a..670f25782 100644 --- a/web/templates/admin/list_ip.html +++ b/web/templates/admin/list_ip.html @@ -62,8 +62,8 @@
+sort-netmask="" sort-interface="" sort-domains="" +sort-owner="" sort-star="">
@@ -132,7 +132,7 @@ sort-owner="" sort-star="
:
- +
diff --git a/web/templates/admin/list_packages.html b/web/templates/admin/list_packages.html index d06f06088..26bdcf1c2 100644 --- a/web/templates/admin/list_packages.html +++ b/web/templates/admin/list_packages.html @@ -56,8 +56,8 @@ ?> -
@@ -126,7 +126,7 @@ sort-star="
:
- +
diff --git a/web/templates/admin/list_updates.html b/web/templates/admin/list_updates.html index 86e3c96c5..7a0753e7a 100644 --- a/web/templates/admin/list_updates.html +++ b/web/templates/admin/list_updates.html @@ -54,10 +54,10 @@ if ($data[$key]['UPDATED'] == 'yes') { $status = 'active'; - $upd_status = __('updated'); + $upd_status = 'updated'; } else { $status = 'suspended'; - $upd_status = __('outdated'); + $upd_status = 'outdated'; } ?> From 6fd8787985febfc0b70e7bb87fb597b1f2823e0b Mon Sep 17 00:00:00 2001 From: Flat Date: Sun, 3 Jul 2016 15:47:24 +0900 Subject: [PATCH 02/14] Don't translate those which shouldn't be translated `those` are - Numbers - Already translated texts - User names - Network interfaces - Package names, template names and shells --- web/templates/admin/add_package.html | 22 +++++++++++----------- web/templates/admin/edit_package.html | 20 ++++++++++---------- web/templates/admin/edit_web.html | 23 +++++++++++------------ web/templates/admin/list_packages.html | 8 ++++---- web/templates/admin/list_web.html | 16 ++++++++-------- web/templates/user/list_web.html | 6 +++--- 6 files changed, 47 insertions(+), 48 deletions(-) diff --git a/web/templates/admin/add_package.html b/web/templates/admin/add_package.html index ec4e675c3..3a8dda480 100644 --- a/web/templates/admin/add_package.html +++ b/web/templates/admin/add_package.html @@ -72,11 +72,11 @@ } echo ">".htmlentities($value)."\n"; } - ?> + ?> - + " . strtoupper($_SESSION['WEB_BACKEND']). "" ;?> @@ -94,15 +94,15 @@ if ((!empty($v_backend_template)) && ( $value == $_POST['v_backend_template'])){ echo 'selected' ; } - echo ">".$value."\n"; + echo ">".htmlentities($value)."\n"; } - ?> + ?> - + - + " .strtoupper($_SESSION['PROXY_SYSTEM']) . "" ;?> @@ -123,11 +123,11 @@ } echo ">".htmlentities($value)."\n"; } - ?> + ?> - + " .strtoupper($_SESSION['DNS_SYSTEM']) . "" ;?> @@ -147,7 +147,7 @@ } echo ">".htmlentities($value)."\n"; } - ?> + ?> @@ -170,7 +170,7 @@ } echo ">".htmlentities($value)."\n"; } - ?> + ?> @@ -410,4 +410,4 @@ }) }); - \ No newline at end of file + diff --git a/web/templates/admin/edit_package.html b/web/templates/admin/edit_package.html index 4480fa825..8a8e82cca 100644 --- a/web/templates/admin/edit_package.html +++ b/web/templates/admin/edit_package.html @@ -72,11 +72,11 @@ } echo ">".htmlentities($value)."\n"; } - ?> + ?> - + " .strtoupper($_SESSION['WEB_BACKEND']) . "";?> @@ -94,14 +94,14 @@ if ((!empty($v_backend_template)) && ( $value == $_POST['v_backend_template'])){ echo ' selected' ; } - echo ">".$value."\n"; + echo ">".htmlentities($value)."\n"; } - ?> + ?> - - + + " .strtoupper($_SESSION['PROXY_SYSTEM']) . "";?> @@ -121,11 +121,11 @@ } echo ">".htmlentities($value)."\n"; } - ?> + ?> - + " .strtoupper($_SESSION['DNS_SYSTEM']) . "";?> @@ -145,7 +145,7 @@ } echo ">".htmlentities($value)."\n"; } - ?> + ?> @@ -411,4 +411,4 @@ }) }); - \ No newline at end of file + diff --git a/web/templates/admin/edit_web.html b/web/templates/admin/edit_web.html index 51822ec78..5abd6af6c 100644 --- a/web/templates/admin/edit_web.html +++ b/web/templates/admin/edit_web.html @@ -141,11 +141,11 @@ } echo ">".htmlentities($value)."\n"; } - ?> + ?> - + " . strtoupper($_SESSION['WEB_BACKEND']) . "";?> @@ -164,14 +164,14 @@ if ((empty($v_backend_template)) && ($value == 'default')){ echo ' selected' ; } - echo ">".$value."\n"; + echo ">".htmlentities($value)."\n"; } - ?> + ?> - - + + @@ -200,7 +200,7 @@ } echo ">".htmlentities($value)."\n"; } - ?> + ?> @@ -217,7 +217,7 @@ - + / @@ -247,7 +247,7 @@ - + @@ -296,7 +296,7 @@ } echo ">". htmlentities(__($value)) ."\n"; } - ?> + ?> @@ -430,7 +430,7 @@ \ No newline at end of file +
diff --git a/web/templates/admin/add_web.html b/web/templates/admin/add_web.html index 2a9170291..ee489c423 100644 --- a/web/templates/admin/add_web.html +++ b/web/templates/admin/add_web.html @@ -142,7 +142,7 @@ - + @@ -153,7 +153,7 @@ @@ -164,7 +164,7 @@
- +
- + / @@ -242,7 +242,7 @@ } echo ">" . htmlentities(__($value)) . "\n"; } - ?> + ?> diff --git a/web/templates/admin/list_services.html b/web/templates/admin/list_services.html index aa85671c7..28cd8ba3f 100644 --- a/web/templates/admin/list_services.html +++ b/web/templates/admin/list_services.html @@ -91,7 +91,7 @@
-
:
+
:
From 7be9a01b8dd90cf542fc9727a2d85fd1399adb3c Mon Sep 17 00:00:00 2001 From: Flat Date: Sun, 3 Jul 2016 16:26:19 +0900 Subject: [PATCH 05/14] Translate [Back] buttons, 'delete' links, 'Add one more Name Server' links --- web/templates/admin/add_package.html | 18 +++++++++--------- web/templates/admin/edit_package.html | 18 +++++++++--------- web/templates/admin/list_backup_detail.html | 2 +- .../admin/list_backup_exclusions.html | 2 +- web/templates/admin/list_dns_rec.html | 2 +- web/templates/admin/list_firewall_banlist.html | 2 +- web/templates/admin/list_mail_acc.html | 2 +- web/templates/user/list_dns_rec.html | 2 +- web/templates/user/list_mail_acc.html | 2 +- 9 files changed, 25 insertions(+), 25 deletions(-) diff --git a/web/templates/admin/add_package.html b/web/templates/admin/add_package.html index 3a8dda480..bcf9aaac1 100644 --- a/web/templates/admin/add_package.html +++ b/web/templates/admin/add_package.html @@ -302,20 +302,20 @@ delete + delete + - delete + '.__('delete').' '; @@ -323,7 +323,7 @@ echo ' - delete + '.__('delete').' '; @@ -331,7 +331,7 @@ echo ' - delete + '.__('delete').' '; @@ -339,7 +339,7 @@ echo ' - delete + '.__('delete').' '; @@ -347,7 +347,7 @@ echo ' - delete + '.__('delete').' '; @@ -355,13 +355,13 @@ echo ' - delete + '.__('delete').' '; ?> > - Add one more Name Server + diff --git a/web/templates/admin/edit_package.html b/web/templates/admin/edit_package.html index 8a8e82cca..9767e0fc4 100644 --- a/web/templates/admin/edit_package.html +++ b/web/templates/admin/edit_package.html @@ -300,13 +300,13 @@ delete + delete + @@ -314,7 +314,7 @@ echo ' - delete + '.__('delete').' '; @@ -322,7 +322,7 @@ echo ' - delete + '.__('delete').' '; @@ -330,7 +330,7 @@ echo ' - delete + '.__('delete').' '; @@ -338,7 +338,7 @@ echo ' - delete + '.__('delete').' '; @@ -346,7 +346,7 @@ echo ' - delete + '.__('delete').' '; @@ -354,14 +354,14 @@ echo ' - delete + '.__('delete').' '; ?> > - Add one more Name Server + diff --git a/web/templates/admin/list_backup_detail.html b/web/templates/admin/list_backup_detail.html index 2c721ba7a..65449b0b7 100644 --- a/web/templates/admin/list_backup_detail.html +++ b/web/templates/admin/list_backup_detail.html @@ -393,7 +393,7 @@ ?>
- back +
diff --git a/web/templates/admin/list_backup_exclusions.html b/web/templates/admin/list_backup_exclusions.html index d9de37639..1f0998af2 100644 --- a/web/templates/admin/list_backup_exclusions.html +++ b/web/templates/admin/list_backup_exclusions.html @@ -111,7 +111,7 @@
- back +
diff --git a/web/templates/admin/list_dns_rec.html b/web/templates/admin/list_dns_rec.html index e4b55877b..0dd32b599 100644 --- a/web/templates/admin/list_dns_rec.html +++ b/web/templates/admin/list_dns_rec.html @@ -139,7 +139,7 @@ v_unit_id="" v_section="dns_rec"> ?>
- back +
diff --git a/web/templates/admin/list_firewall_banlist.html b/web/templates/admin/list_firewall_banlist.html index ae6f835d6..52e315987 100644 --- a/web/templates/admin/list_firewall_banlist.html +++ b/web/templates/admin/list_firewall_banlist.html @@ -118,7 +118,7 @@ ?>
- back +
diff --git a/web/templates/admin/list_mail_acc.html b/web/templates/admin/list_mail_acc.html index 9607d127e..2d133d6bf 100644 --- a/web/templates/admin/list_mail_acc.html +++ b/web/templates/admin/list_mail_acc.html @@ -216,7 +216,7 @@ sort-star="
- back +
diff --git a/web/templates/user/list_dns_rec.html b/web/templates/user/list_dns_rec.html index 2cf428a4b..5a811fdeb 100644 --- a/web/templates/user/list_dns_rec.html +++ b/web/templates/user/list_dns_rec.html @@ -136,7 +136,7 @@ ?>
- back +
diff --git a/web/templates/user/list_mail_acc.html b/web/templates/user/list_mail_acc.html index 70bc38dc0..6439803fa 100644 --- a/web/templates/user/list_mail_acc.html +++ b/web/templates/user/list_mail_acc.html @@ -204,7 +204,7 @@ sort-star="
- back +
From e76c3fd808e68266a702f1e8dc5d2b62082575f7 Mon Sep 17 00:00:00 2001 From: Flat Date: Sun, 3 Jul 2016 16:37:10 +0900 Subject: [PATCH 06/14] Translate page titles, dialog captions, 'Shortcuts', firewall actions & protocols, and list2ban chains I think protocols and chains shouldn't be translated --- web/templates/admin/add_firewall.html | 16 ++++++++-------- web/templates/admin/add_firewall_banlist.html | 14 +++++++------- web/templates/admin/edit_firewall.html | 16 ++++++++-------- web/templates/admin/list_firewall.html | 12 ++++++------ web/templates/admin/list_firewall_banlist.html | 4 ++-- web/templates/admin/list_server_info.html | 4 ++-- web/templates/footer.html | 6 +++--- web/templates/header.html | 2 +- 8 files changed, 37 insertions(+), 37 deletions(-) diff --git a/web/templates/admin/add_firewall.html b/web/templates/admin/add_firewall.html index de3d63723..27f478393 100644 --- a/web/templates/admin/add_firewall.html +++ b/web/templates/admin/add_firewall.html @@ -54,28 +54,28 @@ @@ -128,4 +128,4 @@
- +
- +
- \ No newline at end of file + diff --git a/web/templates/admin/add_firewall_banlist.html b/web/templates/admin/add_firewall_banlist.html index 43d41ba57..55e8b7a09 100644 --- a/web/templates/admin/add_firewall_banlist.html +++ b/web/templates/admin/add_firewall_banlist.html @@ -60,13 +60,13 @@ diff --git a/web/templates/admin/edit_firewall.html b/web/templates/admin/edit_firewall.html index 60a13e164..c6f42279a 100644 --- a/web/templates/admin/edit_firewall.html +++ b/web/templates/admin/edit_firewall.html @@ -60,28 +60,28 @@ @@ -130,4 +130,4 @@
- +
- +
- \ No newline at end of file + diff --git a/web/templates/admin/list_firewall.html b/web/templates/admin/list_firewall.html index 73990d58d..1a02a9360 100644 --- a/web/templates/admin/list_firewall.html +++ b/web/templates/admin/list_firewall.html @@ -72,8 +72,8 @@ } ?> -
@@ -121,11 +121,11 @@ sort-ip="" sort-comment="
-
-
+
+
-
-
+
+
diff --git a/web/templates/admin/list_firewall_banlist.html b/web/templates/admin/list_firewall_banlist.html index 52e315987..94fab3dbf 100644 --- a/web/templates/admin/list_firewall_banlist.html +++ b/web/templates/admin/list_firewall_banlist.html @@ -47,7 +47,7 @@ foreach ($data as $key => $value) { ++$i; list($ip,$chain) = explode(":",$key); - + ?>
@@ -83,7 +83,7 @@
 
-
+
diff --git a/web/templates/admin/list_server_info.html b/web/templates/admin/list_server_info.html index 94d5e833d..53dc2185b 100644 --- a/web/templates/admin/list_server_info.html +++ b/web/templates/admin/list_server_info.html @@ -3,7 +3,7 @@ - Vesta - <?=__($TAB)?> + Vesta - <?=__($TAB)?> @@ -41,4 +41,4 @@
.
- 
\ No newline at end of file
+  
diff --git a/web/templates/footer.html b/web/templates/footer.html
index b67ab41b8..96526fa1b 100644
--- a/web/templates/footer.html
+++ b/web/templates/footer.html
@@ -8,16 +8,16 @@
     
     
 
-    
 
-