From ebe2d4d3a442840fca11af39f9314362646bb6f8 Mon Sep 17 00:00:00 2001 From: billz Date: Tue, 24 Oct 2017 07:18:23 +0000 Subject: [PATCH 1/4] Added es_ES to list of supported languages --- includes/locale.php | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/includes/locale.php b/includes/locale.php index a123b17a..19119af1 100755 --- a/includes/locale.php +++ b/includes/locale.php @@ -5,6 +5,15 @@ * */ + +/** +* Rudimentary language detection via the browser. +* Accept-Language returns a list of weighted values with a quality (or 'q') parameter. +* A better method would parse the list of preferred languages and match this with +* the languages supported by out platform. +* +* Refer to: https://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.4 +*/ if (!isset($_SESSION["locale"])) { $lang = substr($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2); switch ($lang){ @@ -16,15 +25,19 @@ if (!isset($_SESSION["locale"])) { break; case "it": $locale = "it_IT.UTF-8"; - break; + break; + case "es": + $locale = "es_ES.UTF-8"; + break; default: $locale = "en_US.UTF-8"; break; } } -// debug -$locale = "fr_FR.UTF-8"; +// Uncomment for testing +// Note: the associated locale must be installed on the RPi +//$locale = "fr_FR.UTF-8"; $_SESSION["locale"] = $locale; // activate the locale setting putenv("LANG=" . $_SESSION["locale"]); From 1e92e9f22a93ce87f7f36810626c79335c050e23 Mon Sep 17 00:00:00 2001 From: billz Date: Tue, 24 Oct 2017 08:32:31 +0000 Subject: [PATCH 2/4] Updated .po with missing strings --- locale/en_US/LC_MESSAGES/messages.po | 87 ++++++++++++++++++++++++++-- 1 file changed, 81 insertions(+), 6 deletions(-) diff --git a/locale/en_US/LC_MESSAGES/messages.po b/locale/en_US/LC_MESSAGES/messages.po index 344d920d..25a0aa2d 100644 --- a/locale/en_US/LC_MESSAGES/messages.po +++ b/locale/en_US/LC_MESSAGES/messages.po @@ -1,15 +1,16 @@ -# 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. +# RaspAP Portable Object file +# Project home: https://github.com/billz/raspap-webgui +# Licensed under the GNU General Public License v3.0 +# This file is distributed under the same license as the RaspAP package +# FIRST AUTHOR billzimmerman@gmail.com, 2017 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: 1.2.1\n" -"Report-Msgid-Bugs-To: \n" +"Report-Msgid-Bugs-To: billzimmerman@gmail.com\n" "POT-Creation-Date: 2017-10-19 08:56+0000\n" -"PO-Revision-Date: 2017-10-23 9:50+0000\n" +"PO-Revision-Date: 2017-10-24 9:50+0000\n" "Last-Translator: Bill Zimmerman \n" "Language-Team: \n" "Language: en_US\n" @@ -98,6 +99,27 @@ msgstr "Security" msgid "Passphrase" msgstr "Passphrase" +msgid "Wifi settings updated successfully" +msgstr "Wifi settings updated successfully" + +msgid "Wifi settings updated but cannot restart (cannon execute 'wpa_cli reconfigure')" +msgstr "Wifi settings updated but cannot restart (cannon execute 'wpa_cli reconfigure')" + +msgid "Wifi settings failed to be updated" +msgstr "Wifi settings failed to be updated" + +msgid "Failed to updated wifi settings" +msgstr "Failed to updated wifi settings" + +msgid "Update" +msgstr "Update" + +msgid "Add" +msgstr "Add" + +msgid "Delete" +msgstr "Delete" + 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" @@ -159,6 +181,30 @@ msgstr "Link Quality" msgid "Information provided by ifconfig and iwconfig" msgstr "Information provided by ifconfig and iwconfig" +msgid "No MAC Address Found" +msgstr "No MAC Address Found" + +msgid "No IP Address Found" +msgstr "No IP Address Found" + +msgid "No Subnet Mask Found" +msgstr "No Subnet Mask Found" + +msgid "No Data" +msgstr "No Data" + +msgid "Not connected" +msgstr "Not connected" + +msgid "Interface is up" +msgstr "Interface is up" + +msgid "Interface is down" +msgstr "Interface is down" + +msgid "Interface already down" +msgstr "Interface already down" + #: includes/dhcp.php msgid "Server settings" msgstr "Server settings" @@ -202,6 +248,33 @@ msgstr "Stop dnsmasq" msgid "Start dnsmasq" msgstr "Start dnsmasq" +msgid "Dnsmasq configuration updated successfully" +msgstr "Dnsmasq configuration updated successfully" + +msgid "dnsmasq already running" +msgstr "dnsmasq already running" + +msgid "Successfully started dnsmasq" +msgstr "Successfully started dnsmasq" + +msgid "Failed to start dnsmasq" +msgstr "Failed to start dnsmasq" + +msgid "Successfully stopped dnsmasq" +msgstr "Successfully stopped dnsmasq" + +msgid "Failed to stop dnsmasq" +msgstr "Failed to stop dnsmasq" + +msgid "dnsmasq already stopped" +msgstr "dnsmasq already stopped" + +msgid "Dnsmasq is running" +msgstr "Dnsmasq is running" + +msgid "Dnsmasq is not running" +msgstr "Dnsmasq is not running" + #: includes/hostapd.php msgid "Basic" msgstr "Basic" @@ -263,4 +336,6 @@ msgstr "Select a theme" msgid "Save settings" msgstr "Save settings" +msgid "Refresh" +msgstr "Refresh" From d5e77d8207ee2ac841e930491357aaa6cd8cb37e Mon Sep 17 00:00:00 2001 From: billz Date: Tue, 24 Oct 2017 08:33:01 +0000 Subject: [PATCH 3/4] Recompiled machine object file --- locale/en_US/LC_MESSAGES/messages.mo | Bin 4739 -> 6504 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 e9b8990dfceb2c4433c3d7517edd8fd452b0e1e3..e924d3d52e64609a69dd3f56faae5175ec0386d7 100644 GIT binary patch literal 6504 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 Date: Tue, 24 Oct 2017 08:34:20 +0000 Subject: [PATCH 4/4] Typo in description --- includes/locale.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/locale.php b/includes/locale.php index 19119af1..30502b94 100755 --- a/includes/locale.php +++ b/includes/locale.php @@ -10,7 +10,7 @@ * Rudimentary language detection via the browser. * Accept-Language returns a list of weighted values with a quality (or 'q') parameter. * A better method would parse the list of preferred languages and match this with -* the languages supported by out platform. +* the languages supported by our platform. * * Refer to: https://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.4 */ @@ -37,7 +37,7 @@ if (!isset($_SESSION["locale"])) { // Uncomment for testing // Note: the associated locale must be installed on the RPi -//$locale = "fr_FR.UTF-8"; +// $locale = "fr_FR.UTF-8"; $_SESSION["locale"] = $locale; // activate the locale setting putenv("LANG=" . $_SESSION["locale"]);