From 943ce23180b16db7aade881948f7e16ddffc54c7 Mon Sep 17 00:00:00 2001 From: billz Date: Mon, 23 Oct 2017 17:17:28 +0000 Subject: [PATCH 01/14] initial commit of base en_US strings --- locale/en_US/LC_MESSAGES/messages.po | 255 +++++++++++++++++++++++++++ 1 file changed, 255 insertions(+) create mode 100644 locale/en_US/LC_MESSAGES/messages.po diff --git a/locale/en_US/LC_MESSAGES/messages.po b/locale/en_US/LC_MESSAGES/messages.po new file mode 100644 index 00000000..bc2798b0 --- /dev/null +++ b/locale/en_US/LC_MESSAGES/messages.po @@ -0,0 +1,255 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR billzimmerman@gmail.com, 2017. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: 1.2.1\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-10-19 08:56+0000\n" +"PO-Revision-Date: 2017-10-23 9:50+0000\n" +"Last-Translator: Bill Zimmerman \n" +"Language-Team: \n" +"Language: en_US\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: index.php +msgid "RaspAP Wifi Configuration Portal" +msgstr "RaspAP Wifi Configuration Portal" + +msgid "Toggle navigation" +msgstr "Toggle navigation" + +msgid "RaspAP Wifi Portal v1.2.1" +msgstr "RaspAP Wifi Portal v1.2.1" + +msgid "Dashboard" +msgstr "Dashboard" + +msgid "Configure client" +msgstr "Configure client" + +msgid "Configure hotspot" +msgstr "Configure hotspot" + +msgid "Configure DHCP" +msgstr "Configure DHCP" + +msgid "Configure OpenVPN" +msgstr "Configure OpenVPN" + +msgid "Configure TOR proxy" +msgstr "Configure TOR proxy" + +msgid "Configure Auth" +msgstr "Configure Auth" + +msgid "Change Theme" +msgstr "Change Theme" + +msgid "System" +msgstr "System" + +#: includes/admin.php +msgid "New passwords do not match" +msgstr "New passwords do not match" + +msgid "Username must not be empty" +msgstr "Username must not be empty" + +msgid "Admin password updated" +msgstr "Admin password updated" + +msgid "Failed to update admin password" +msgstr "Failed to update admin password" + +msgid "Old password does not match" +msgstr "Old password does not match" + +msgid "Username" +msgstr "Username" + +msgid "Old password" +msgstr "Old password" + +msgid "New password" +msgstr "New password" + +msgid "Repeat new password" +msgstr "Repeat new password" + +#: includes/configure_client.php +msgid "Client settings" +msgstr "Client settings" + +msgid "SSID" +msgstr "SSID" + +msgid "Channel" +msgstr "Channel" + +msgid "Security" +msgstr "Security" + +msgid "Passphrase" +msgstr "Passphrase" + +msgid "Note: WEP access points appear as 'Open'. RaspAP does not currently support connecting to WEP" +msgstr "Note: WEP access points appear as 'Open'. RaspAP does not currently support connecting to WEP" + +#: includes/dashboard.php +msgid "Interface Information" +msgstr "Interface Information" + +msgid "Interface Name" +msgstr "Interface Name" + +msgid "IP Address" +msgstr "IP Address" + +msgid "Subnet Mask" +msgstr "Subnet Mask" + +msgid "Mac Address" +msgstr "Mac Address" + +msgid "Interface Statistics" +msgstr "Interface Statistics" + +msgid "Received Packets" +msgstr "Received Packets" + +msgid "Received Bytes" +msgstr "Received Bytes" + +msgid "Transferred Packets" +msgstr "Transferred Packets" + +msgid "Transferred Bytes" +msgstr "Transferred Bytes" + +msgid "Wireless Information" +msgstr "Wireless Information" + +msgid "Connected To" +msgstr "Connected To" + +msgid "AP Mac Address" +msgstr "AP Mac Address" + +msgid "Bitrate" +msgstr "Bitrate" + +msgid "Signal Level" +msgstr "Signal Level" + +msgid "Transmit Power" +msgstr "Transmit Power" + +msgid "Frequency" +msgstr "Frequency" + +msgid "Link Quality" +msgstr "Link Quality" + +msgid "Information provided by ifconfig and iwconfig" +msgstr "Information provided by ifconfig and iwconfig" + +#: includes/dhcp.php +msgid "Server settings" +msgstr "Server settings" + +msgid "Client list" +msgstr "Client list" + +msgid "Starting IP Address" +msgstr "Starting IP Address" + +msgid "Ending IP Address" +msgstr "Ending IP Address" + +msgid "Lease Time" +msgstr "Lease Time" + +msgid "Interval" +msgstr "Interval" + +msgid "Active DHCP leases" +msgstr "Active DHCP leases" + +msgid "Expire time" +msgstr "Expire time" + +msgid "MAC Address" +msgstr "MAC Address" + +msgid "Host name" +msgstr "Host name" + +msgid "Client ID" +msgstr "Client ID" + +msgid "Information provided by Dnsmasq" +msgstr "Information provided by Dnsmasq" + +#: includes/hostapd.php +msgid "Basic" +msgstr "Basic" + +msgid "Advanced" +msgstr "Advanced" + +msgid "Basic settings" +msgstr "Basic settings" + +msgid "Wireless Mode" +msgstr "Wireless Mode" + +msgid "Security settings" +msgstr "Security settings" + +msgid "Security type" +msgstr "Security type" + +msgid "Encryption Type" +msgstr "Encryption Type" + +msgid "PSK" +msgstr "PSK" + +msgid "Advanced settings" +msgstr "Advanced settings" + +msgid "Country Code" +msgstr "Country Code" + +msgid "Information provided by hostapd" +msgstr "Information provided by hostapd" + +#: includes/system.php +msgid "Hostname" +msgstr "Hostname" + +msgid "Pi Revision" +msgstr "Pi Revision" + +msgid "Uptime" +msgstr "Uptime" + +msgid "Memory Used" +msgstr "Memory Used" + +msgid "CPU Load" +msgstr "CPU Load" + +#: includes/themes.php +msgid "Theme settings" +msgstr "Theme settings" + +msgid "Select a theme" +msgstr "Select a theme" + From ce96cfcf15c7a278149dff388bbf698b74c52940 Mon Sep 17 00:00:00 2001 From: billz Date: Mon, 23 Oct 2017 17:18:26 +0000 Subject: [PATCH 02/14] initial commit of machine object file --- locale/en_US/LC_MESSAGES/messages.mo | Bin 0 -> 4579 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 locale/en_US/LC_MESSAGES/messages.mo diff --git a/locale/en_US/LC_MESSAGES/messages.mo b/locale/en_US/LC_MESSAGES/messages.mo new file mode 100644 index 0000000000000000000000000000000000000000..8b1ac19baa7d88c1d4faae97070af38313dc852e GIT binary patch literal 4579 zcmeH}&u=706~~LPWWmeNB!nddr~qL@lJVM3cH^CFHfxW)tP_tt@r-w+2o&1g<(baT zba%RY#yjBvf+!?Nh(t<|NPq)B#19E1;D!(&?SVs32nPfl$blaxR%ki!L&}BEcc#bg zM9P2Q(!Bokt9tdS>eZ|2dHI?H&l*Y{xe!ipLveQ6#N#H-H!^s z2rKCSgztto(pmGIgV(_YNRv4S)&C)=c|8m@?oPqa7yNS3{ye;a_U{$?CHOw{m*5-W zWhj4Fp!~c7Ej&o&d*Llm^H_w6%L7nx+Jf530o1%c4HbvS;M?F=p!$6qDo#Izn(rm3 z{x3m|_czGan=4TE|Aq2%HI3q7DEnKX+D}2**P+I3L9OqTP;t5lHU5|2u{Rj=JdDtP z$KdLJnnvZ>I#ix*LHQX%jrTdIJbMPp{y9i0nD0Z`{TON;KP&2g4GEd~Eo3P3C#d!Q z9jgDo3m!m`|7)Svb2C&tPZag{LHYee!4S&t0LtHIq53}sHO@ETD1V^rUM%=WsCoVc z5=!$AD7*g@ydGy2^y5%@7C@TJqfqgC5~}|`*5Yu z53xAq*kB#g>D&(ny`e)+Y))hTK=^$Kl<`dl2pI z2atP^Dq<0x??puWWKL#z8b|F@YjN(XCyy4IJ-^(rp6|OXvq>CAd1k#Nab9Y@%pO@! zTy$jGZg^R;(6B-5G8@IY_4{e+qP#n_SwBhQl$tn-oS%nL+vc%+8tm(yZx@0f#kX0Y zap3II*;>PPotHVPf?gQe#LKdsI1Ow+3B23|R1dt!FTL2z3|; zORC~>uCZ3CX{~SAB#kc)OLhKe%u+=s&a)(D*m1O6U|TUtKg!dgt;K;eOJ3I5ioG;2 z%aNZBlRS(g+ZrYgJy3L48oMD~zLy*h7eloMS%@> z#tPQCOSe7W*^=Kbu zIS=cu7ZdEwj09VAJG<%kDkUS;M~O}({Ek`g277j8W$#3c4I9n-O@n++Iw`Xb^^ON%sDo@YQys{xLg&S zSN62Lnr4$sZ#oXDf-!m7J2bmBxpJ%Nx*T5X*?e?nnl2r$-GGC{CZwZt zUdozge=Bl1=RLb%n!_x2Ju^CedoEgWyWMr<-5_j_mTg+87iHUyi)6B}a?NCIqq<(0 z+eW2{A(KJCZ7Q&X#4aec4tDlO;rnAt?HS{FUE*_^7c)R)VPnwcW$a&EwiE|aRw-NpQ9 z()GgVZtHivlpFA#&DNR9{GMI0KNT*bSXWQg&TobJ)c$v5|2wk(9Wndgkuiw# literal 0 HcmV?d00001 From 81cd6391a400ab1e386831ef803270e0cb00826b Mon Sep 17 00:00:00 2001 From: billz Date: Mon, 23 Oct 2017 17:19:20 +0000 Subject: [PATCH 03/14] mode change for consistency --- includes/authenticate.php | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 includes/authenticate.php diff --git a/includes/authenticate.php b/includes/authenticate.php old mode 100644 new mode 100755 From 89e0e3f38a0770b51cd4ea173f46328af60c1c9c Mon Sep 17 00:00:00 2001 From: billz Date: Mon, 23 Oct 2017 17:19:27 +0000 Subject: [PATCH 04/14] mode change for consistency --- includes/status_messages.php | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 includes/status_messages.php diff --git a/includes/status_messages.php b/includes/status_messages.php old mode 100644 new mode 100755 From 5cc5d2528e14ca111ead7a9739bffb29007b30c1 Mon Sep 17 00:00:00 2001 From: billz Date: Mon, 23 Oct 2017 17:19:35 +0000 Subject: [PATCH 05/14] mode change for consistency --- includes/themes.php | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 includes/themes.php diff --git a/includes/themes.php b/includes/themes.php old mode 100644 new mode 100755 From 81eee567e6b74525772c42dc2f21a43def116cf8 Mon Sep 17 00:00:00 2001 From: billz Date: Mon, 23 Oct 2017 17:19:43 +0000 Subject: [PATCH 06/14] mode change for consistency --- raspap.php | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 raspap.php diff --git a/raspap.php b/raspap.php old mode 100644 new mode 100755 From c8ca228dadc0b52267c44936c97089b5afb3be9c Mon Sep 17 00:00:00 2001 From: billz Date: Mon, 23 Oct 2017 17:26:07 +0000 Subject: [PATCH 07/14] initial commit --- includes/locale.php | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100755 includes/locale.php diff --git a/includes/locale.php b/includes/locale.php new file mode 100755 index 00000000..2d9aabc7 --- /dev/null +++ b/includes/locale.php @@ -0,0 +1,45 @@ +locale: ' . $locale . "
"; +echo 'locale root: ' .$locale_root . "
"; + +$results = bindtextdomain($domain, $locale_root); +echo 'new text domain is set: ' . $results. "
"; + +$results = textdomain($domain); +echo 'current message domain is set: ' . $results. "
"; +?> From 6fb18e1649cb607f025e99179196c39da649d82c Mon Sep 17 00:00:00 2001 From: billz Date: Mon, 23 Oct 2017 17:37:59 +0000 Subject: [PATCH 08/14] Added gettext for i18n support --- index.php | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/index.php b/index.php index 1c1eb921..79f4f0b6 100755 --- a/index.php +++ b/index.php @@ -44,6 +44,7 @@ define('RASPI_OPENVPN_ENABLED', false ); define('RASPI_TORPROXY_ENABLED', false ); include_once( RASPI_CONFIG.'/raspap.php' ); +include_once( 'includes/locale.php'); include_once( 'includes/functions.php' ); include_once( 'includes/dashboard.php' ); include_once( 'includes/authenticate.php' ); @@ -84,7 +85,7 @@ $theme_url = 'dist/css/' . $theme; - Raspbian WiFi Configuration Portal + <?php echo _("Raspbian WiFi Configuration Portal"); ?> @@ -127,7 +128,7 @@ $theme_url = 'dist/css/' . $theme; - RaspAP Wifi Portal v1.2.2 + @@ -136,35 +137,35 @@ $theme_url = 'dist/css/' . $theme;
From 7137f6c814451173635b8b2e7649187917580187 Mon Sep 17 00:00:00 2001 From: billz Date: Mon, 23 Oct 2017 19:48:46 +0000 Subject: [PATCH 09/14] Initial commit --- locale/fr_FR/LC_MESSAGES/messages.mo | Bin 0 -> 5104 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 locale/fr_FR/LC_MESSAGES/messages.mo diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo new file mode 100644 index 0000000000000000000000000000000000000000..3d9392efad3990a064752f5cfc13c18246262126 GIT binary patch literal 5104 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 literal 0 HcmV?d00001 From aec857dd964433ce34fd863c90c091c553c2b51d Mon Sep 17 00:00:00 2001 From: billz Date: Mon, 23 Oct 2017 19:48:50 +0000 Subject: [PATCH 10/14] Initial commit --- locale/fr_FR/LC_MESSAGES/messages.po | 264 +++++++++++++++++++++++++++ 1 file changed, 264 insertions(+) create mode 100644 locale/fr_FR/LC_MESSAGES/messages.po diff --git a/locale/fr_FR/LC_MESSAGES/messages.po b/locale/fr_FR/LC_MESSAGES/messages.po new file mode 100644 index 00000000..fc3f427b --- /dev/null +++ b/locale/fr_FR/LC_MESSAGES/messages.po @@ -0,0 +1,264 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR billzimmerman@gmail.com, 2017. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: 1.2.1\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-10-19 08:56+0000\n" +"PO-Revision-Date: 2017-10-23 9:50+0000\n" +"Last-Translator: Bill Zimmerman \n" +"Language-Team: \n" +"Language: fr_FR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: index.php +msgid "RaspAP Wifi Configuration Portal" +msgstr "RaspAP Wifi Portail de Configuration" + +msgid "Toggle navigation" +msgstr "Toggle navigation" + +msgid "RaspAP Wifi Portal v1.2.1" +msgstr "RaspAP Wifi Portal v1.2.1" + +msgid "Dashboard" +msgstr "Tableau de bord" + +msgid "Configure client" +msgstr "Configurer le client" + +msgid "Configure hotspot" +msgstr "Configurer le hotspot" + +msgid "Configure DHCP" +msgstr "Configurer DHCP" + +msgid "Configure OpenVPN" +msgstr "Configurer OpenVPN" + +msgid "Configure TOR proxy" +msgstr "Configurer le proxy TOR" + +msgid "Configure Auth" +msgstr "Configurer l'authentification" + +msgid "Change Theme" +msgstr "Change le thème" + +msgid "System" +msgstr "Système" + +#: includes/admin.php +msgid "New passwords do not match" +msgstr "Les nouveaux mots de passe ne correspondent pas" + +msgid "Username must not be empty" +msgstr "Le nom d'utilisateur ne doit pas être vide" + +msgid "Admin password updated" +msgstr "Mot de passe admin modifié" + +msgid "Failed to update admin password" +msgstr "Modifier le mot de passe d'admin a échouéd" + +msgid "Old password does not match" +msgstr "L'ancien mot de passe ne correspond pas" + +msgid "Username" +msgstr "Nom d'utilisateur" + +msgid "Old password" +msgstr "Ancien mot de passe" + +msgid "New password" +msgstr "Nouveau mot de passe" + +msgid "Repeat new password" +msgstr "Répété le nouveau mot de passe" + +#: includes/configure_client.php +msgid "Client settings" +msgstr "Paramètres du client" + +msgid "SSID" +msgstr "SSID" + +msgid "Channel" +msgstr "Canal" + +msgid "Security" +msgstr "Sécurité" + +msgid "Passphrase" +msgstr "Phrase secrète" + +msgid "Note: WEP access points appear as 'Open'. RaspAP does not currently support connecting to WEP" +msgstr "Remarque: Les points d'accès WEP apparaissent comme 'ouverts'. RaspAP ne prend actuellement pas en charge la connexion à WEP" + +#: includes/dashboard.php +msgid "Interface Information" +msgstr "Informations d'interface" + +msgid "Interface Name" +msgstr "Nom de l'interface" + +msgid "IP Address" +msgstr "Adresse IP" + +msgid "Subnet Mask" +msgstr "Masque de sous-réseau" + +msgid "Mac Address" +msgstr "Adresse Mac" + +msgid "Interface Statistics" +msgstr "Statistiques d'interface" + +msgid "Received Packets" +msgstr "Paquets reçus" + +msgid "Received Bytes" +msgstr "Octets reçus" + +msgid "Transferred Packets" +msgstr "Paquets transférés" + +msgid "Transferred Bytes" +msgstr "Octets transférés" + +msgid "Wireless Information" +msgstr "Informations sans fil" + +msgid "Connected To" +msgstr "Connecté à" + +msgid "AP Mac Address" +msgstr "AP Mac Adresse" + +msgid "Bitrate" +msgstr "Bitrate" + +msgid "Signal Level" +msgstr "Niveau du signal" + +msgid "Transmit Power" +msgstr "Puissance de transmission" + +msgid "Frequency" +msgstr "La fréquence" + +msgid "Link Quality" +msgstr "Qualité de lien" + +msgid "Information provided by ifconfig and iwconfig" +msgstr "Informations fournies par ifconfig et iwconfig" + +#: includes/dhcp.php +msgid "Server settings" +msgstr "Paramètres du serveur" + +msgid "Client list" +msgstr "Liste des clients" + +msgid "Starting IP Address" +msgstr "Adresse IP de départ" + +msgid "Ending IP Address" +msgstr "Adresse IP de fin" + +msgid "Lease Time" +msgstr "Temps de bail" + +msgid "Interval" +msgstr "Intervalle" + +msgid "Active DHCP leases" +msgstr "Baux DHCP actifs" + +msgid "Expire time" +msgstr "Temps d'expiration" + +msgid "MAC Address" +msgstr "Adresse Mac" + +msgid "Host name" +msgstr "Nom d'hôte" + +msgid "Client ID" +msgstr "ID du client" + +msgid "Information provided by Dnsmasq" +msgstr "Informations fournies par Dnsmasq" + +msgid "Stop dnsmasq" +msgstr "Stop dnsmasq" + +msgid "Start dnsmasq" +msgstr "Commencer dnsmasq" + +#: includes/hostapd.php +msgid "Basic" +msgstr "De base" + +msgid "Advanced" +msgstr "Avancé" + +msgid "Basic settings" +msgstr "Paramètres de base" + +msgid "Wireless Mode" +msgstr "Mode sans fil" + +msgid "Security settings" +msgstr "Les paramètres de sécurité" + +msgid "Security type" +msgstr "Type de sécurité" + +msgid "Encryption Type" +msgstr "Type de chiffrement" + +msgid "PSK" +msgstr "PSK" + +msgid "Advanced settings" +msgstr "Réglages avancés" + +msgid "Country Code" +msgstr "Le code du pays" + +msgid "Information provided by hostapd" +msgstr "Informations fournies par hostapd" + +#: includes/system.php +msgid "Hostname" +msgstr "Nom d'hôte" + +msgid "Pi Revision" +msgstr "Pi Révision" + +msgid "Uptime" +msgstr "Durée de fonctionnent" + +msgid "Memory Used" +msgstr "Mémoire utilisée" + +msgid "CPU Load" +msgstr "Charge du processeur" + +#: includes/themes.php +msgid "Theme settings" +msgstr "Réglage des thèmes" + +msgid "Select a theme" +msgstr "Sélectionnez un thème" + +#: common form controls +msgid "Save settings" +msgstr "Enregistrer les paramètres" From 57cd26b6cc27d563b39f8f6856368217b8b4034e Mon Sep 17 00:00:00 2001 From: billz Date: Mon, 23 Oct 2017 19:50:12 +0000 Subject: [PATCH 11/14] Additional msgid/msgstr pairs --- locale/en_US/LC_MESSAGES/messages.mo | Bin 4579 -> 4739 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/locale/en_US/LC_MESSAGES/messages.mo b/locale/en_US/LC_MESSAGES/messages.mo index 8b1ac19baa7d88c1d4faae97070af38313dc852e..e9b8990dfceb2c4433c3d7517edd8fd452b0e1e3 100644 GIT binary patch literal 4739 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 From 1aa5c1765475caba95319505c0e5386acda41b0e Mon Sep 17 00:00:00 2001 From: billz Date: Mon, 23 Oct 2017 19:50:14 +0000 Subject: [PATCH 12/14] Additional msgid/msgstr pairs --- locale/en_US/LC_MESSAGES/messages.po | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/locale/en_US/LC_MESSAGES/messages.po b/locale/en_US/LC_MESSAGES/messages.po index bc2798b0..344d920d 100644 --- a/locale/en_US/LC_MESSAGES/messages.po +++ b/locale/en_US/LC_MESSAGES/messages.po @@ -36,8 +36,8 @@ msgstr "Configure client" msgid "Configure hotspot" msgstr "Configure hotspot" -msgid "Configure DHCP" -msgstr "Configure DHCP" +msgid "Configure DHCP Server" +msgstr "Configure DHCP Server" msgid "Configure OpenVPN" msgstr "Configure OpenVPN" @@ -196,6 +196,12 @@ msgstr "Client ID" msgid "Information provided by Dnsmasq" msgstr "Information provided by Dnsmasq" +msgid "Stop dnsmasq" +msgstr "Stop dnsmasq" + +msgid "Start dnsmasq" +msgstr "Start dnsmasq" + #: includes/hostapd.php msgid "Basic" msgstr "Basic" @@ -253,3 +259,8 @@ msgstr "Theme settings" msgid "Select a theme" msgstr "Select a theme" +#: common form controls +msgid "Save settings" +msgstr "Save settings" + + From 062d5aeb4f8c5ee5af2a7e219ab3e270b4f07f12 Mon Sep 17 00:00:00 2001 From: billz Date: Mon, 23 Oct 2017 19:51:34 +0000 Subject: [PATCH 13/14] Replaced interface labels with gettext() --- includes/admin.php | 10 +++---- includes/configure_client.php | 12 ++++----- includes/dashboard.php | 48 ++++++++++++++++----------------- includes/dhcp.php | 37 ++++++++++++-------------- includes/hostapd.php | 32 +++++++++++----------- includes/locale.php | 50 +++++++++++++++-------------------- includes/system.php | 36 ++++++++++++++----------- includes/themes.php | 10 +++---- index.php | 2 +- 9 files changed, 116 insertions(+), 121 deletions(-) diff --git a/includes/admin.php b/includes/admin.php index ea2ede1f..8592b178 100755 --- a/includes/admin.php +++ b/includes/admin.php @@ -38,32 +38,32 @@ function DisplayAuthConfig($username, $password){
-
Configure Auth
+

showMessages(); ?>

- +
- +
- +
- +
diff --git a/includes/configure_client.php b/includes/configure_client.php index 4b1ede62..24eca808 100755 --- a/includes/configure_client.php +++ b/includes/configure_client.php @@ -145,7 +145,7 @@ function DisplayWPAConfig(){
-
Configure client
+

showMessages(); ?>

@@ -159,10 +159,10 @@ function DisplayWPAConfig(){ - - - - + + + + @@ -207,7 +207,7 @@ function DisplayWPAConfig(){
SSIDChannelSecurityPassphrase
-
Note, WEP access points appear as 'Open'. RaspAP does not currently support connecting to WEP.
+
Note: WEP access points appear as 'Open'. RaspAP does not currently support connecting to WEP"); ?>
diff --git a/includes/dashboard.php b/includes/dashboard.php index 1f66542a..995c5c47 100755 --- a/includes/dashboard.php +++ b/includes/dashboard.php @@ -77,24 +77,24 @@ function DisplayDashboard(){
-
Dashboard
+

showMessages(); ?>

-

Interface Information

-
Interface Name
wlan0
-
IP Address

-
Subnet Mask

-
Mac Address


+

+
wlan0
+

+

+


-

Interface Statistics

-
Received Packets

-
Received Bytes


-
Transferred Packets

-
Transferred Bytes

+

+

+


+

+

@@ -102,14 +102,14 @@ function DisplayDashboard(){
-

Wireless Information

-
Connected To

-
AP Mac Address

-
Bitrate

-
Signal Level

-
Transmit Power

-
Frequency


-
Link Quality
+

+

+

+

+

+

+


+
-
+
'; + echo ''; } else { - echo ''; + echo ''; } ?> - + " onclick="document.location.reload(true)" />
-
Information provided by ifconfig and iwconfig
+
diff --git a/includes/dhcp.php b/includes/dhcp.php index 465d56e4..f65059f6 100755 --- a/includes/dhcp.php +++ b/includes/dhcp.php @@ -98,16 +98,15 @@ function DisplayDHCPConfig() {
-
Configure DHCP -
+

showMessages(); ?>

@@ -136,36 +135,36 @@ function DisplayDHCPConfig() {
- +
- +
- +
- +
- + " name="savedhcpdsettings" /> '; + echo ''; } else { - echo''; + echo''; } ?> @@ -175,20 +174,18 @@ function DisplayDHCPConfig() {

Client list

-
- Active DHCP leases -
+
- - - - - + + + + + @@ -213,7 +210,7 @@ function DisplayDHCPConfig() { -
Information provided by Dnsmasq
+
diff --git a/includes/hostapd.php b/includes/hostapd.php index ece1a83d..46ca8aae 100755 --- a/includes/hostapd.php +++ b/includes/hostapd.php @@ -64,27 +64,27 @@ function DisplayHostAPDConfig(){
-
Configure hotspot
+

showMessages(); ?>

-

Basic settings

+

- + @@ -92,49 +92,49 @@ function DisplayHostAPDConfig(){
- +
- +
- +
-

Security settings

+

- +
- +
- +
-

Advanced settings

+

- + - - + " /> + " /> + " onclick="document.location.reload(true)" />
-
- -
+
+
+
+ +
+
+
diff --git a/includes/themes.php b/includes/themes.php index 44af3511..fb3850c0 100755 --- a/includes/themes.php +++ b/includes/themes.php @@ -25,18 +25,18 @@ function DisplayThemeConfig(){
-
Change Theme
+
-

Theme settings

+

- - @@ -50,7 +50,7 @@ function DisplayThemeConfig(){
- + " onclick="document.location.reload(true)" />
diff --git a/index.php b/index.php index 79f4f0b6..1665dfbf 100755 --- a/index.php +++ b/index.php @@ -146,7 +146,7 @@ $theme_url = 'dist/css/' . $theme;
  • - +
  • From 1212ef51f7f09cd41f849c50205c9cf5ed90049e Mon Sep 17 00:00:00 2001 From: billz Date: Mon, 23 Oct 2017 20:02:39 +0000 Subject: [PATCH 14/14] Added constants for locales --- includes/locale.php | 38 ++++++++++++++++++-------------------- index.php | 4 ++++ 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/includes/locale.php b/includes/locale.php index af6f6c18..a123b17a 100755 --- a/includes/locale.php +++ b/includes/locale.php @@ -6,21 +6,21 @@ */ if (!isset($_SESSION["locale"])) { - $lang = substr($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2); - switch ($lang){ - case "de": - $locale = "de_DE.UTF-8"; - break; - case "fr": - $locale = "fr_FR.UTF-8"; - break; - case "it": - $locale = "it_IT.UTF-8"; - break; - default: - $locale = "en_US.UTF-8"; - break; - } + $lang = substr($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2); + switch ($lang){ + case "de": + $locale = "de_DE.UTF-8"; + break; + case "fr": + $locale = "fr_FR.UTF-8"; + break; + case "it": + $locale = "it_IT.UTF-8"; + break; + default: + $locale = "en_US.UTF-8"; + break; + } } // debug @@ -30,10 +30,8 @@ $_SESSION["locale"] = $locale; putenv("LANG=" . $_SESSION["locale"]); setlocale(LC_ALL, $_SESSION["locale"]); -$domain = "messages"; -$locale_root = "locale"; -bindtextdomain($domain, $locale_root); -bind_textdomain_codeset($domain, 'UTF-8'); +bindtextdomain(LOCALE_DOMAIN, LOCALE_ROOT); +bind_textdomain_codeset(LOCALE_DOMAIN, 'UTF-8'); -textdomain($domain); +textdomain(LOCALE_DOMAIN); ?> diff --git a/index.php b/index.php index 1665dfbf..fcecd06f 100755 --- a/index.php +++ b/index.php @@ -43,6 +43,10 @@ define('RASPI_TORPROXY_CONFIG', '/etc/tor/torrc'); define('RASPI_OPENVPN_ENABLED', false ); define('RASPI_TORPROXY_ENABLED', false ); +// Locale settings +define('LOCALE_ROOT', 'locale'); +define('LOCALE_DOMAIN', 'messages'); + include_once( RASPI_CONFIG.'/raspap.php' ); include_once( 'includes/locale.php'); include_once( 'includes/functions.php' );
    • Expire timeMAC AddressIP AddressHost nameClient ID