From 4948e39164484f2f30e6b6ea1bc3090d592c7ccb Mon Sep 17 00:00:00 2001 From: "a. bellenir" Date: Thu, 24 May 2018 14:49:10 -0400 Subject: [PATCH] use tt2-translated Yes/No values for bool fields Signed-off-by: a. bellenir --- Open-ILS/src/templates/staff/base_js.tt2 | 2 ++ Open-ILS/web/js/ui/default/staff/services/grid.js | 9 ++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Open-ILS/src/templates/staff/base_js.tt2 b/Open-ILS/src/templates/staff/base_js.tt2 index e2e88de..92d28d2 100644 --- a/Open-ILS/src/templates/staff/base_js.tt2 +++ b/Open-ILS/src/templates/staff/base_js.tt2 @@ -138,6 +138,8 @@ UpUp.start({ s.CONFIRM_IN_HOUSE_NUM_USES_COUNT_TITLE = "[% l('Are you sure you want to record {{num_uses}} uses for this?') %]"; s.PAGE_TITLE_DEFAULT = "[% l('Evergreen Staff Client') %]"; s.PAGE_TITLE_DYNAMIC_AND_CONTEXT = "[% l('[_1] - [_2]', '{{dynamic}}', '{{context}}') %]"; + s.YES = "[% l('Yes') %]"; + s.NO = "[% l('No') %]"; }]); diff --git a/Open-ILS/web/js/ui/default/staff/services/grid.js b/Open-ILS/web/js/ui/default/staff/services/grid.js index fc3a05b..0756e3d 100644 --- a/Open-ILS/web/js/ui/default/staff/services/grid.js +++ b/Open-ILS/web/js/ui/default/staff/services/grid.js @@ -2116,11 +2116,10 @@ angular.module('egGridMod', /** * Translates bare IDL object values into display values. * 1. Passes dates through the angular date filter - * 2. Translates bools to Booleans so the browser can display translated - * value. (Though we could manually translate instead..) + * 2. Converts bools to translated Yes/No strings * Others likely to follow... */ -.filter('egGridValueFilter', ['$filter','egCore', function($filter,egCore) { +.filter('egGridValueFilter', ['$filter','egCore', 'egStrings', function($filter,egCore,egStrings) { function traversePath(obj,path) { var list = path.split('.'); for (var part in path) { @@ -2138,11 +2137,11 @@ angular.module('egGridMod', case 't' : case '1' : // legacy case true: - return ''+true; + return egStrings.YES; case 'f' : case '0' : // legacy case false: - return ''+false; + return egStrings.NO; // value may be null, '', etc. default : return ''; } -- 2.7.4