summaryrefslogtreecommitdiffstats
path: root/src/usr/local/www/system.php
diff options
context:
space:
mode:
authorPhil Davis <phil@jankaritech.com>2017-04-29 23:08:00 +0545
committerGitHub <noreply@github.com>2017-04-29 23:08:00 +0545
commit27db3c75aacf478d09d6f58d356001c883c9a9f7 (patch)
tree3c5a7bb3c7a70ab77e9517cfeee72d602bdcc20c /src/usr/local/www/system.php
parent74ddcdb2be383425c745c2ed9cea1649ad73d25a (diff)
downloadpfsense-27db3c75aacf478d09d6f58d356001c883c9a9f7.zip
pfsense-27db3c75aacf478d09d6f58d356001c883c9a9f7.tar.gz
Set default anguage in General Setup to en_US
Since https://github.com/pfsense/pfsense/commit/fdcde31b4a910c4e058513c1e3f68a62e722da6b added German to the top of the get_locale_list() array, if you start with a default system and go to System->General Setup (make some changes to other fields if you like) and press Save, you end up in German because that is what gets selected in the dropdown when the config does not yet have a language in it. The code assumed that the language of the default system is the language at the top of the list, which is no longer true.
Diffstat (limited to 'src/usr/local/www/system.php')
-rw-r--r--src/usr/local/www/system.php5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/usr/local/www/system.php b/src/usr/local/www/system.php
index 53fbf80..0e02922 100644
--- a/src/usr/local/www/system.php
+++ b/src/usr/local/www/system.php
@@ -47,6 +47,11 @@ if (!isset($config['system']['webgui']['dashboardcolumns'])) {
$config['system']['webgui']['dashboardcolumns'] = 2;
}
+// set default language if unset
+if (!isset($config['system']['language'])) {
+ $config['system']['language'] = 'en_US';
+}
+
$dnsgw_counter = 1;
while (isset($config["system"]["dns{$dnsgw_counter}gw"])) {
OpenPOWER on IntegriCloud