[open-ils-commits] [GIT] Evergreen ILS branch master updated. f92437b231b91adf2dd1e6802f36923a9124f60a
Evergreen Git
git at git.evergreen-ils.org
Tue Sep 19 23:47:36 EDT 2017
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 f92437b231b91adf2dd1e6802f36923a9124f60a (commit)
from 4d202fcc96ebdcd58364850d429142c386bd0c8f (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 f92437b231b91adf2dd1e6802f36923a9124f60a
Author: Ben Shum <ben at evergreener.net>
Date: Thu Sep 14 10:22:28 2017 -0400
LP#1629078: Add missing strings in web client for i18n
Linda Jansova found a series of strings that were missing the localization
tagging indicated by the "l" function we use in tt2 code.
This patch adds them in preparation for the next PO template sync to grab
them to make them available for translation via Launchpad, etc.
Signed-off-by: Ben Shum <ben at evergreener.net>
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
diff --git a/Open-ILS/src/templates/staff/admin/workstation/t_splash.tt2 b/Open-ILS/src/templates/staff/admin/workstation/t_splash.tt2
index 578ba73..94c1140 100644
--- a/Open-ILS/src/templates/staff/admin/workstation/t_splash.tt2
+++ b/Open-ILS/src/templates/staff/admin/workstation/t_splash.tt2
@@ -78,7 +78,7 @@
<div class="row">
<div class="col-md-8">
- <label for="search_lib_selector">[% ('Default Search Library') %]</label>
+ <label for="search_lib_selector">[% l('Default Search Library') %]</label>
<p>[% l('The default search library setting determines what library is searched from the advanced search screen and portal page by default. Manual selection of a search library will override it. One recommendation is to set the search library to the highest point you would normally want to search.') %]</p>
</div>
<div class="col-md-4">
@@ -92,7 +92,7 @@
<div class="row new-entry">
<div class="col-md-8">
- <label for="pref_lib_selector">[% ('Preferred Library') %]</label>
+ <label for="pref_lib_selector">[% l('Preferred Library') %]</label>
<p>[% l('The preferred library is used to show copies and URIs regardless of the library searched. One recommendation is to set this to your workstation library so that local copies show up first in search results.') %]</p>
</div>
<div class="col-md-4">
@@ -106,7 +106,7 @@
<div class="row new-entry">
<div class="col-md-8">
- <label for="adv_pane_selector">[% ('Advanced Search Default Pane') %]</label>
+ <label for="adv_pane_selector">[% l('Advanced Search Default Pane') %]</label>
<p>[% l('Advanced search has secondary panes for Numeric and MARC Expert searching. You can change which one is loaded by default when opening a new catalog window here.') %]</p>
</div>
<div class="col-md-4">
diff --git a/Open-ILS/src/templates/staff/cat/bucket/copy/t_apply_tags.tt2 b/Open-ILS/src/templates/staff/cat/bucket/copy/t_apply_tags.tt2
index bc009b6..64a6891 100644
--- a/Open-ILS/src/templates/staff/cat/bucket/copy/t_apply_tags.tt2
+++ b/Open-ILS/src/templates/staff/cat/bucket/copy/t_apply_tags.tt2
@@ -8,7 +8,7 @@
<ul>
<li ng-repeat="map in tag_map" ng-show="!map.isdeleted()">
<span class="copy_tag_label">{{map.tag().label()}}</span>
- <button type="button" ng-click="map.isdeleted(1)" class="btn btn-xs btn-warning">[% ('Remove') %]</button>
+ <button type="button" ng-click="map.isdeleted(1)" class="btn btn-xs btn-warning">[% l('Remove') %]</button>
</li>
</ul>
<div class="row">
diff --git a/Open-ILS/src/templates/staff/cat/volcopy/t_copy_tags.tt2 b/Open-ILS/src/templates/staff/cat/volcopy/t_copy_tags.tt2
index c2878f8..773f5db 100644
--- a/Open-ILS/src/templates/staff/cat/volcopy/t_copy_tags.tt2
+++ b/Open-ILS/src/templates/staff/cat/volcopy/t_copy_tags.tt2
@@ -8,7 +8,7 @@
<ul>
<li ng-repeat="map in tag_map" ng-show="!map.isdeleted()">
<span class="copy_tag_label">{{map.tag().label()}}</span>
- <button type="button" ng-click="map.isdeleted(1)" class="btn btn-xs btn-warning">[% ('Remove') %]</button>
+ <button type="button" ng-click="map.isdeleted(1)" class="btn btn-xs btn-warning">[% l('Remove') %]</button>
</li>
</ul>
<div class="row">
diff --git a/Open-ILS/src/templates/staff/cat/volcopy/t_defaults.tt2 b/Open-ILS/src/templates/staff/cat/volcopy/t_defaults.tt2
index 8d20cf2..c3cc46c 100644
--- a/Open-ILS/src/templates/staff/cat/volcopy/t_defaults.tt2
+++ b/Open-ILS/src/templates/staff/cat/volcopy/t_defaults.tt2
@@ -27,7 +27,7 @@
<div class="col-xs-12">
<h4 class="pad-vert">[% l('Creation Defaults') %]</h4>
<select class="form-control" ng-change="saveDefaults()" ng-model="defaults.classification" ng-options="cl.id() as cl.name() for cl in classification_list">
- <option value="">[% ('Use Library Setting') %]</option>
+ <option value="">[% l('Use Library Setting') %]</option>
</select>
</div>
</div>
diff --git a/Open-ILS/src/templates/staff/circ/patron/t_bills_list.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_bills_list.tt2
index 840b83d..a6be0cc 100644
--- a/Open-ILS/src/templates/staff/circ/patron/t_bills_list.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_bills_list.tt2
@@ -48,12 +48,12 @@
<eg-grid-action label="[% l('Full Details') %]"
handler="showFullDetails"></eg-grid-action>
- <eg-grid-field label="[% ('Balance Owed') %]" path='summary.balance_owed'></eg-grid-field>
- <eg-grid-field label="[% ('Bill #') %]" path='id'></eg-grid-field>
- <eg-grid-field label="[% ('Start') %]" path='xact_start' datatype="timestamp"></eg-grid-field>
- <eg-grid-field label="[% ('Total Billed') %]" path='summary.total_owed'></eg-grid-field>
- <eg-grid-field label="[% ('Total Paid') %]" path='summary.total_paid'></eg-grid-field>
- <eg-grid-field label="[% ('Type') %]" path='xact_type'></eg-grid-field>
+ <eg-grid-field label="[% l('Balance Owed') %]" path='summary.balance_owed'></eg-grid-field>
+ <eg-grid-field label="[% l('Bill #') %]" path='id'></eg-grid-field>
+ <eg-grid-field label="[% l('Start') %]" path='xact_start' datatype="timestamp"></eg-grid-field>
+ <eg-grid-field label="[% l('Total Billed') %]" path='summary.total_owed'></eg-grid-field>
+ <eg-grid-field label="[% l('Total Paid') %]" path='summary.total_paid'></eg-grid-field>
+ <eg-grid-field label="[% l('Type') %]" path='xact_type'></eg-grid-field>
<!-- receipt data -->
<eg-grid-field path='summary.last_billing_type' required></eg-grid-field>
@@ -91,7 +91,7 @@
</eg-grid-field>
<!-- virtual field -->
- <eg-grid-field datatype="money" label="[% ('Payment Pending') %]"
+ <eg-grid-field datatype="money" label="[% l('Payment Pending') %]"
name="payment_pending"></eg-grid-field>
<!-- import all circ fields, hidden by default -->
diff --git a/Open-ILS/src/templates/staff/circ/patron/t_search_results.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_search_results.tt2
index ffac971..65ef0a1 100644
--- a/Open-ILS/src/templates/staff/circ/patron/t_search_results.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_search_results.tt2
@@ -23,28 +23,28 @@
label="{{bkt.name()}}" handler-data="bkt"
handler="addToBucket" disabled="need_one_selected"></eg-grid-menu-item>
- <eg-grid-field label="[% ('ID') %]" path='id' visible></eg-grid-field>
- <eg-grid-field label="[% ('Card') %]" path='card.barcode' visible></eg-grid-field>
- <eg-grid-field label="[% ('Profile') %]" path='profile.name' visible></eg-grid-field>
- <eg-grid-field label="[% ('Last Name') %]" path='family_name' visible sortable multisortable></eg-grid-field>
- <eg-grid-field label="[% ('First Name') %]" path='first_given_name' visible sortable multisortable></eg-grid-field>
- <eg-grid-field label="[% ('Middle Name') %]" path='second_given_name' visible sortable multisortable></eg-grid-field>
- <eg-grid-field label="[% ('DoB') %]" path='dob' dateformat="{{$root.egDateFormat}}" datatype="timestamp" visible sortable multisortable></eg-grid-field>
- <eg-grid-field label="[% ('Home Library') %]" path='home_ou.shortname' visible></eg-grid-field>
- <eg-grid-field label="[% ('Created On') %]" path='create_date' datatype="timestamp" visible sortable multisortable></eg-grid-field>
-
- <eg-grid-field label="[% ('Mailing:Street 1') %]" path='mailing_address.street1' visible></eg-grid-field>
- <eg-grid-field label="[% ('Mailing:Street 2') %]" path='mailing_address.street2'></eg-grid-field>
- <eg-grid-field label="[% ('Mailing:City') %]" path='mailing_address.city'></eg-grid-field>
- <eg-grid-field label="[% ('Mailing:County') %]" path='mailing_address.county'></eg-grid-field>
- <eg-grid-field label="[% ('Mailing:State') %]" path='mailing_address.state'></eg-grid-field>
- <eg-grid-field label="[% ('Mailing:Zip') %]" path='mailing_address.post_code'></eg-grid-field>
-
- <eg-grid-field label="[% ('Billing:Street 1') %]" path='billing_address.street1'></eg-grid-field>
- <eg-grid-field label="[% ('Billing:Street 2') %]" path='billing_address.street2'></eg-grid-field>
- <eg-grid-field label="[% ('Billing:City') %]" path='billing_address.city'></eg-grid-field>
- <eg-grid-field label="[% ('Billing:County') %]" path='billing_address.county'></eg-grid-field>
- <eg-grid-field label="[% ('Billing:State') %]" path='billing_address.state'></eg-grid-field>
- <eg-grid-field label="[% ('Billing:Zip') %]" path='billing_address.post_code'></eg-grid-field>
+ <eg-grid-field label="[% l('ID') %]" path='id' visible></eg-grid-field>
+ <eg-grid-field label="[% l('Card') %]" path='card.barcode' visible></eg-grid-field>
+ <eg-grid-field label="[% l('Profile') %]" path='profile.name' visible></eg-grid-field>
+ <eg-grid-field label="[% l('Last Name') %]" path='family_name' visible sortable multisortable></eg-grid-field>
+ <eg-grid-field label="[% l('First Name') %]" path='first_given_name' visible sortable multisortable></eg-grid-field>
+ <eg-grid-field label="[% l('Middle Name') %]" path='second_given_name' visible sortable multisortable></eg-grid-field>
+ <eg-grid-field label="[% l('DoB') %]" path='dob' dateformat="{{$root.egDateFormat}}" datatype="timestamp" visible sortable multisortable></eg-grid-field>
+ <eg-grid-field label="[% l('Home Library') %]" path='home_ou.shortname' visible></eg-grid-field>
+ <eg-grid-field label="[% l('Created On') %]" path='create_date' datatype="timestamp" visible sortable multisortable></eg-grid-field>
+
+ <eg-grid-field label="[% l('Mailing:Street 1') %]" path='mailing_address.street1' visible></eg-grid-field>
+ <eg-grid-field label="[% l('Mailing:Street 2') %]" path='mailing_address.street2'></eg-grid-field>
+ <eg-grid-field label="[% l('Mailing:City') %]" path='mailing_address.city'></eg-grid-field>
+ <eg-grid-field label="[% l('Mailing:County') %]" path='mailing_address.county'></eg-grid-field>
+ <eg-grid-field label="[% l('Mailing:State') %]" path='mailing_address.state'></eg-grid-field>
+ <eg-grid-field label="[% l('Mailing:Zip') %]" path='mailing_address.post_code'></eg-grid-field>
+
+ <eg-grid-field label="[% l('Billing:Street 1') %]" path='billing_address.street1'></eg-grid-field>
+ <eg-grid-field label="[% l('Billing:Street 2') %]" path='billing_address.street2'></eg-grid-field>
+ <eg-grid-field label="[% l('Billing:City') %]" path='billing_address.city'></eg-grid-field>
+ <eg-grid-field label="[% l('Billing:County') %]" path='billing_address.county'></eg-grid-field>
+ <eg-grid-field label="[% l('Billing:State') %]" path='billing_address.state'></eg-grid-field>
+ <eg-grid-field label="[% l('Billing:Zip') %]" path='billing_address.post_code'></eg-grid-field>
<eg-grid-field path='*' ignore="id family_name first_given_name second_given_name dob create_date"></eg-grid-field>
</eg-grid>
diff --git a/Open-ILS/src/templates/staff/serials/t_prediction_wizard.tt2 b/Open-ILS/src/templates/staff/serials/t_prediction_wizard.tt2
index cd97232..aeb8222 100644
--- a/Open-ILS/src/templates/staff/serials/t_prediction_wizard.tt2
+++ b/Open-ILS/src/templates/staff/serials/t_prediction_wizard.tt2
@@ -71,12 +71,12 @@
<button class="btn btn-warning btn-sm"
ng-if="pattern.enum_levels.length > 1"
ng-click="pattern.drop_enum_level()">
- [% ('Remove Level') %]
+ [% l('Remove Level') %]
</button>
<button class="btn btn-warning btn-sm"
ng-disabled="pattern.enum_levels.length >= 6"
ng-click="pattern.add_enum_level()">
- [% ('Add Level') %]
+ [% l('Add Level') %]
</button>
</div>
</div>
@@ -126,12 +126,12 @@
<button class="btn btn-warning btn-sm"
ng-if="pattern.alt_enum_levels.length > 1"
ng-click="pattern.drop_alt_enum_level()">
- [% ('Remove Level') %]
+ [% l('Remove Level') %]
</button>
<button class="btn btn-warning btn-sm"
ng-disabled="pattern.alt_enum_levels.length >= 2"
ng-click="pattern.add_alt_enum_level()">
- [% ('Add Level') %]
+ [% l('Add Level') %]
</button>
</div>
</div>
diff --git a/Open-ILS/src/templates/staff/share/t_patron_search_results.tt2 b/Open-ILS/src/templates/staff/share/t_patron_search_results.tt2
index 885aded..7b3cf9c 100644
--- a/Open-ILS/src/templates/staff/share/t_patron_search_results.tt2
+++ b/Open-ILS/src/templates/staff/share/t_patron_search_results.tt2
@@ -8,28 +8,28 @@
items-provider="patronSearchGridProvider"
persist-key="circ.patron.search">
- <eg-grid-field label="[% ('ID') %]" path='id' visible></eg-grid-field>
- <eg-grid-field label="[% ('Card') %]" path='card.barcode' visible></eg-grid-field>
- <eg-grid-field label="[% ('Profile') %]" path='profile.name' visible></eg-grid-field>
- <eg-grid-field label="[% ('Last Name') %]" path='family_name' visible sortable multisortable></eg-grid-field>
- <eg-grid-field label="[% ('First Name') %]" path='first_given_name' visible sortable multisortable></eg-grid-field>
- <eg-grid-field label="[% ('Middle Name') %]" path='second_given_name' visible sortable multisortable></eg-grid-field>
- <eg-grid-field label="[% ('DoB') %]" path='dob' visible sortable multisortable></eg-grid-field>
- <eg-grid-field label="[% ('Home Library') %]" path='home_ou.shortname' visible></eg-grid-field>
- <eg-grid-field label="[% ('Created On') %]" path='create_date' visible sortable multisortable></eg-grid-field>
+ <eg-grid-field label="[% l('ID') %]" path='id' visible></eg-grid-field>
+ <eg-grid-field label="[% l('Card') %]" path='card.barcode' visible></eg-grid-field>
+ <eg-grid-field label="[% l('Profile') %]" path='profile.name' visible></eg-grid-field>
+ <eg-grid-field label="[% l('Last Name') %]" path='family_name' visible sortable multisortable></eg-grid-field>
+ <eg-grid-field label="[% l('First Name') %]" path='first_given_name' visible sortable multisortable></eg-grid-field>
+ <eg-grid-field label="[% l('Middle Name') %]" path='second_given_name' visible sortable multisortable></eg-grid-field>
+ <eg-grid-field label="[% l('DoB') %]" path='dob' visible sortable multisortable></eg-grid-field>
+ <eg-grid-field label="[% l('Home Library') %]" path='home_ou.shortname' visible></eg-grid-field>
+ <eg-grid-field label="[% l('Created On') %]" path='create_date' visible sortable multisortable></eg-grid-field>
- <eg-grid-field label="[% ('Mailing:Street 1') %]" path='mailing_address.street1' visible></eg-grid-field>
- <eg-grid-field label="[% ('Mailing:Street 2') %]" path='mailing_address.street2'></eg-grid-field>
- <eg-grid-field label="[% ('Mailing:City') %]" path='mailing_address.city'></eg-grid-field>
- <eg-grid-field label="[% ('Mailing:County') %]" path='mailing_address.county'></eg-grid-field>
- <eg-grid-field label="[% ('Mailing:State') %]" path='mailing_address.state'></eg-grid-field>
- <eg-grid-field label="[% ('Mailing:Zip') %]" path='mailing_address.post_code'></eg-grid-field>
+ <eg-grid-field label="[% l('Mailing:Street 1') %]" path='mailing_address.street1' visible></eg-grid-field>
+ <eg-grid-field label="[% l('Mailing:Street 2') %]" path='mailing_address.street2'></eg-grid-field>
+ <eg-grid-field label="[% l('Mailing:City') %]" path='mailing_address.city'></eg-grid-field>
+ <eg-grid-field label="[% l('Mailing:County') %]" path='mailing_address.county'></eg-grid-field>
+ <eg-grid-field label="[% l('Mailing:State') %]" path='mailing_address.state'></eg-grid-field>
+ <eg-grid-field label="[% l('Mailing:Zip') %]" path='mailing_address.post_code'></eg-grid-field>
- <eg-grid-field label="[% ('Billing:Street 1') %]" path='billing_address.street1'></eg-grid-field>
- <eg-grid-field label="[% ('Billing:Street 2') %]" path='billing_address.street2'></eg-grid-field>
- <eg-grid-field label="[% ('Billing:City') %]" path='billing_address.city'></eg-grid-field>
- <eg-grid-field label="[% ('Billing:County') %]" path='billing_address.county'></eg-grid-field>
- <eg-grid-field label="[% ('Billing:State') %]" path='billing_address.state'></eg-grid-field>
- <eg-grid-field label="[% ('Billing:Zip') %]" path='billing_address.post_code'></eg-grid-field>
+ <eg-grid-field label="[% l('Billing:Street 1') %]" path='billing_address.street1'></eg-grid-field>
+ <eg-grid-field label="[% l('Billing:Street 2') %]" path='billing_address.street2'></eg-grid-field>
+ <eg-grid-field label="[% l('Billing:City') %]" path='billing_address.city'></eg-grid-field>
+ <eg-grid-field label="[% l('Billing:County') %]" path='billing_address.county'></eg-grid-field>
+ <eg-grid-field label="[% l('Billing:State') %]" path='billing_address.state'></eg-grid-field>
+ <eg-grid-field label="[% l('Billing:Zip') %]" path='billing_address.post_code'></eg-grid-field>
<eg-grid-field path='*' ignore="id family_name first_given_name second_given_name dob create_date"></eg-grid-field>
</eg-grid>
-----------------------------------------------------------------------
Summary of changes:
.../templates/staff/admin/workstation/t_splash.tt2 | 6 +-
.../staff/cat/bucket/copy/t_apply_tags.tt2 | 2 +-
.../templates/staff/cat/volcopy/t_copy_tags.tt2 | 2 +-
.../src/templates/staff/cat/volcopy/t_defaults.tt2 | 2 +-
.../templates/staff/circ/patron/t_bills_list.tt2 | 14 +++---
.../staff/circ/patron/t_search_results.tt2 | 46 ++++++++++----------
.../staff/serials/t_prediction_wizard.tt2 | 8 ++--
.../staff/share/t_patron_search_results.tt2 | 42 +++++++++---------
8 files changed, 61 insertions(+), 61 deletions(-)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list