projects / Evergreen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f4eee80)
LP1802593: Correct formatting of language code in Angularjs, KPAC
authorJane Sandberg <sandbej@linnbenton.edu>
Mon, 29 Jul 2019 18:56:31 +0000 (11:56 -0700)
committerGalen Charlton <gmc@equinoxinitiative.org>
Mon, 5 Aug 2019 14:52:10 +0000 (10:52 -0400)
EgWeb offers two different formats of the current locale: ctx.locale and
ctx.eg_locale.  This commit configures the lang attribute in AngularJS
staff client, OPAC, and KPAC to use eg_locale, since it has the
appropriate format (e.g. en-US, fr-CA).

Also adds some tests for EgWeb's handling of language codes.

Signed-off-by: Jane Sandberg <sandbej@linnbenton.edu>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Open-ILS/src/perlmods/t/15-OpenILS-WWW.t patch | blob | history
Open-ILS/src/templates/base.tt2 patch | blob | history
Open-ILS/src/templates/kpac/parts/base.tt2 patch | blob | history
Open-ILS/src/templates/opac/parts/base.tt2 patch | blob | history
Open-ILS/src/templates/staff/base.tt2 patch | blob | history

diff --git a/Open-ILS/src/perlmods/t/15-OpenILS-WWW.t b/Open-ILS/src/perlmods/t/15-OpenILS-WWW.t
index d55e809..f78a4fa 100644 (file)
--- a/Open-ILS/src/perlmods/t/15-OpenILS-WWW.t
+++ b/Open-ILS/src/perlmods/t/15-OpenILS-WWW.t
@@ -1,6 +1,6 @@
 #!perl -T
 
-use Test::More tests => 9;
+use Test::More tests => 11;
 
 use_ok( 'OpenILS::WWW::BadDebt' );
 use_ok( 'OpenILS::WWW::EGWeb' );
@@ -11,3 +11,6 @@ use_ok( 'OpenILS::WWW::Redirect' );
 use_ok( 'OpenILS::WWW::TemplateBatchBibUpdate' );
 use_ok( 'OpenILS::WWW::Vandelay' );
 use_ok( 'OpenILS::WWW::XMLRPCGateway' );
+
+is( OpenILS::WWW::EGWeb::parse_eg_locale('hy_am'), 'hy-AM', 'correctly formatted Armenian language code' );
+is( OpenILS::WWW::EGWeb::parse_eg_locale(), 'en-US', 'correctly formatted default language code' );
diff --git a/Open-ILS/src/templates/base.tt2 b/Open-ILS/src/templates/base.tt2
index a6f4b8c..ee988bb 100644 (file)
--- a/Open-ILS/src/templates/base.tt2
+++ b/Open-ILS/src/templates/base.tt2
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' lang='[% ctx.locale %]' xml:lang='[% ctx.locale %]'>
+<html xmlns='http://www.w3.org/1999/xhtml' lang='[% ctx.eg_locale %]' xml:lang='[% ctx.eg_locale %]'>
     <head>
         <title>[% ctx.page_title %]</title>
         <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
diff --git a/Open-ILS/src/templates/kpac/parts/base.tt2 b/Open-ILS/src/templates/kpac/parts/base.tt2
index 94364c6..4711c3f 100644 (file)
--- a/Open-ILS/src/templates/kpac/parts/base.tt2
+++ b/Open-ILS/src/templates/kpac/parts/base.tt2
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' lang='[% ctx.locale %]' xml:lang='[% ctx.locale %]'>
+<html xmlns='http://www.w3.org/1999/xhtml' lang='[% ctx.eg_locale %]' xml:lang='[% ctx.eg_locale %]'>
     <head>
         <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
         <link rel="stylesheet" type="text/css" href="[% ctx.media_prefix %]/css/skin/default/kpac/style.css[% ctx.cache_key %]" />
diff --git a/Open-ILS/src/templates/opac/parts/base.tt2 b/Open-ILS/src/templates/opac/parts/base.tt2
index aa12e39..b28f45c 100644 (file)
--- a/Open-ILS/src/templates/opac/parts/base.tt2
+++ b/Open-ILS/src/templates/opac/parts/base.tt2
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang='[% ctx.locale.replace('_', '-') %]'>
+<html lang='[% ctx.eg_locale %]'>
     <head prefix="og: http://ogp.me/ns#">
         <meta charset="utf-8" />
         <meta http-equiv="X-UA-Compatible" content="IE=edge" />
diff --git a/Open-ILS/src/templates/staff/base.tt2 b/Open-ILS/src/templates/staff/base.tt2
index 7ce42ae..78b393b 100644 (file)
--- a/Open-ILS/src/templates/staff/base.tt2
+++ b/Open-ILS/src/templates/staff/base.tt2
@@ -1,6 +1,6 @@
 <!doctype html>
 [%- PROCESS 'staff/config.tt2' %]
-<html lang="[% ctx.locale %]"
+<html lang="[% ctx.eg_locale %]"
     [%- IF ctx.page_app %] ng-app="[% ctx.page_app %]"[% END -%]
     [%- IF ctx.page_ctrl %] ng-controller="[% ctx.page_ctrl %]"[% END %]>
   <head>
Evergreen ILS