Merge branch 'github/pr/55_reprise'

1 files changed, 11 insertions, 1 deletions

diff --git a/httemplate/pref/pref.html b/httemplate/pref/pref.html
index c6bcf6f66..93c71996c 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>