[open-ils-commits] [GIT] Evergreen ILS branch master updated. 1f10da4df50b6b4605c95e8ed5f6fb2d3e8f57bd

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, master has been updated
       via  1f10da4df50b6b4605c95e8ed5f6fb2d3e8f57bd (commit)
      from  33b6a01bfa281340c8b455de44544c9b2123c36c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 1f10da4df50b6b4605c95e8ed5f6fb2d3e8f57bd
Author: Mike Rylander <mrylander at gmail.com>
Date:   Thu Sep 21 13:51:41 2017 -0400

    LP#1717777: Ensure the en-US is always represented in the dropdown
    
    The assumption of an array in the eval'd code was causing the forced
    en_us tag to fail.  Here we push the default en_us into the list of
    locales in a more structured way to ensure that failure doesn't happen.
    
    Signed-off-by: Mike Rylander <mrylander at gmail.com>
    Signed-off-by: Ben Shum <ben at evergreener.net>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGWeb.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGWeb.pm
index 965c7ca..8dc09cb 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGWeb.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGWeb.pm
@@ -374,7 +374,7 @@ sub find_template {
 sub load_locale_handlers {
     my $ctx = shift;
     my @raw = @_;
-    my %locales;
+    my %locales = (en_us => []);
     while (@raw) {
         my ($l,$file) = (shift(@raw),shift(@raw)); 
         $locales{$l} ||= [];
@@ -384,9 +384,6 @@ sub load_locale_handlers {
     my $editor = new_editor();
     my @locale_tags = sort { length($a) <=> length($b) } keys %locales;
 
-    # always fall back to en_us, the assumed template language
-    push(@locale_tags, 'en_us');
-
     for my $idx (0..$#locale_tags) {
 
         my $tag = $locale_tags[$idx];

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/src/perlmods/lib/OpenILS/WWW/EGWeb.pm |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Evergreen ILS