summaryrefslogtreecommitdiff
path: root/httemplate
diff options
context:
space:
mode:
authorIvan Kohler <ivan@freeside.biz>2016-08-18 14:24:41 -0700
committerIvan Kohler <ivan@freeside.biz>2016-08-18 14:24:41 -0700
commit1aecd5bf33146bf3f374341a3814960ae1d419e8 (patch)
tree0fefb042ae45bb5ec796f1c6383f18262fa373d6 /httemplate
parente0b6fe25cca1e2ff566cc0765f6c9fa24ed66ba8 (diff)
parent31e1d1d72a371b856f4ee3e50252bf596bb8a2d1 (diff)
Merge branch 'github/pr/55_reprise'
Diffstat (limited to 'httemplate')
-rw-r--r--httemplate/pref/pref.html12
1 files changed, 11 insertions, 1 deletions
diff --git a/httemplate/pref/pref.html b/httemplate/pref/pref.html
index c6bcf6f..93c7199 100644
--- a/httemplate/pref/pref.html
+++ b/httemplate/pref/pref.html
@@ -36,7 +36,7 @@ Interface
<TH ALIGN="right">Locale: </TH>
<TD COLSPAN=2>
<SELECT NAME="locale">
-% foreach my $locale ( FS::Locales->locales ) {
+% foreach my $locale ( @locales ) {
% my %info = FS::Locales->locale_info($locale);
% my $selected = ($locale eq $curuser->option('locale'))
% ? 'SELECTED' : '';
@@ -287,4 +287,14 @@ my $menu_position = $1;
=~ /^([,\w\@.\-]*)$/ or die "illegal email_address"; #too late
my $email_address = $1;
+my $conf = new FS::Conf;
+
+my @locales = $conf->config('available-locales');
+
+if ( ! @locales ) {
+
+ @locales = FS::Locales->locales ;
+
+}
+
</%init>