projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'github/pr/55_reprise'
[freeside.git]
/
httemplate
/
pref
/
pref.html
diff --git
a/httemplate/pref/pref.html
b/httemplate/pref/pref.html
index
c6bcf6f
..
93c7199
100644
(file)
--- 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">
<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' : '';
% 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;
=~ /^([,\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>
</%init>