[open-ils-commits] [GIT] Evergreen ILS branch master updated. 76708bcc596980d74ed2825d1ba12b3692b35dba
Evergreen Git
git at git.evergreen-ils.org
Tue Aug 13 22:04:25 EDT 2013
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 76708bcc596980d74ed2825d1ba12b3692b35dba (commit)
via 51654a5c4e801a96feff82da4bd41f945e99461b (commit)
from 3e1d2542445dc4dfb16727414671235362d83411 (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 76708bcc596980d74ed2825d1ba12b3692b35dba
Author: Pasi Kallinen <pasi.kallinen at pttk.fi>
Date: Fri Jun 7 19:33:46 2013 +0300
Finish i18n support for config.usr_setting_type
Add the missing oils_i18n_gettext markers to config.usr_setting_type
inserts.
Signed-off-by: Pasi Kallinen <pasi.kallinen at pttk.fi>
Signed-off-by: Remington Steed <rjs7 at calvin.edu>
Signed-off-by: Ben Shum <bshum at biblio.org>
diff --git a/Open-ILS/src/sql/Pg/950.data.seed-values.sql b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
index dd9405d..433fbfd 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -2501,31 +2501,58 @@ INSERT INTO config.weight_assoc(active, org_unit, circ_weights, hold_weights) VA
-- User setting types
INSERT INTO config.usr_setting_type (name,opac_visible,label,description,datatype)
- VALUES ('opac.default_font', TRUE, 'OPAC Font Size', 'OPAC Font Size', 'string');
+ VALUES ('opac.default_font', TRUE,
+ oils_i18n_gettext('opac.default_font', 'OPAC Font Size', 'cust', 'label'),
+ oils_i18n_gettext('opac.default_font', 'OPAC Font Size', 'cust', 'description'),
+ 'string');
INSERT INTO config.usr_setting_type (name,opac_visible,label,description,datatype)
- VALUES ('opac.default_search_depth', TRUE, 'OPAC Search Depth', 'OPAC Search Depth', 'integer');
+ VALUES ('opac.default_search_depth', TRUE,
+ oils_i18n_gettext('opac.default_search_depth', 'OPAC Search Depth', 'cust', 'label'),
+ oils_i18n_gettext('opac.default_search_depth', 'OPAC Search Depth', 'cust', 'description'),
+ 'integer');
INSERT INTO config.usr_setting_type (name,opac_visible,label,description,datatype)
- VALUES ('opac.default_search_location', TRUE, 'OPAC Search Location', 'OPAC Search Location', 'integer');
+ VALUES ('opac.default_search_location', TRUE,
+ oils_i18n_gettext('opac.default_search_location', 'OPAC Search Location', 'cust', 'label'),
+ oils_i18n_gettext('opac.default_search_location', 'OPAC Search Location', 'cust', 'description'),
+ 'integer');
INSERT INTO config.usr_setting_type (name,opac_visible,label,description,datatype)
- VALUES ('opac.hits_per_page', TRUE, 'Hits per Page', 'Hits per Page', 'string');
+ VALUES ('opac.hits_per_page', TRUE,
+ oils_i18n_gettext('opac.hits_per_page', 'Hits per Page', 'cust', 'label'),
+ oils_i18n_gettext('opac.hits_per_page', 'Hits per Page', 'cust', 'description'),
+ 'string');
INSERT INTO config.usr_setting_type (name,opac_visible,label,description,datatype)
- VALUES ('opac.hold_notify', TRUE, 'Hold Notification Format', 'Hold Notification Format', 'string');
+ VALUES ('opac.hold_notify', TRUE,
+ oils_i18n_gettext('opac.hold_notify', 'Hold Notification Format', 'cust', 'label'),
+ oils_i18n_gettext('opac.hold_notify', 'Hold Notification Format', 'cust', 'description'),
+ 'string');
INSERT INTO config.usr_setting_type (name,opac_visible,label,description,datatype)
- VALUES ('staff_client.catalog.record_view.default', TRUE, 'Default Record View', 'Default Record View', 'string');
+ VALUES ('staff_client.catalog.record_view.default', TRUE,
+ oils_i18n_gettext('staff_client.catalog.record_view.default', 'Default Record View', 'cust', 'label'),
+ oils_i18n_gettext('staff_client.catalog.record_view.default', 'Default Record View', 'cust', 'description'),
+ 'string');
INSERT INTO config.usr_setting_type (name,opac_visible,label,description,datatype)
- VALUES ('staff_client.copy_editor.templates', TRUE, 'Copy Editor Template', 'Copy Editor Template', 'object');
+ VALUES ('staff_client.copy_editor.templates', TRUE,
+ oils_i18n_gettext('staff_client.copy_editor.templates', 'Copy Editor Template', 'cust', 'label'),
+ oils_i18n_gettext('staff_client.copy_editor.templates', 'Copy Editor Template', 'cust', 'description'),
+ 'object');
INSERT INTO config.usr_setting_type (name,opac_visible,label,description,datatype)
- VALUES ('circ.holds_behind_desk', FALSE, 'Hold is behind Circ Desk', 'Hold is behind Circ Desk', 'bool');
+ VALUES ('circ.holds_behind_desk', FALSE,
+ oils_i18n_gettext('circ.holds_behind_desk', 'Hold is behind Circ Desk', 'cust', 'label'),
+ oils_i18n_gettext('circ.holds_behind_desk', 'Hold is behind Circ Desk', 'cust', 'description'),
+ 'bool');
INSERT INTO config.usr_setting_type (name,opac_visible,label,description,datatype)
- VALUES ('opac.default_pickup_location', TRUE, 'Default Hold Pickup Location', 'Default location for holds pickup', 'integer');
+ VALUES ('opac.default_pickup_location', TRUE,
+ oils_i18n_gettext('opac.default_pickup_location', 'Default Hold Pickup Location', 'cust', 'label'),
+ oils_i18n_gettext('opac.default_pickup_location', 'Default location for holds pickup', 'cust', 'description'),
+ 'integer');
-- Add groups for org_unit settings
INSERT INTO config.settings_group (name, label) VALUES
commit 51654a5c4e801a96feff82da4bd41f945e99461b
Author: Dan Scott <dan at coffeecode.net>
Date: Tue Feb 19 21:06:05 2013 -0500
Flag cust & oust name/description fields as translatable
Setting type names and descriptions should be translatable, a simple
oils_persist:i18n attribute will do the trick.
Signed-off-by: Dan Scott <dan at coffeecode.net>
Signed-off-by: Remington Steed <rjs7 at calvin.edu>
Signed-off-by: Ben Shum <bshum at biblio.org>
diff --git a/Open-ILS/examples/fm_IDL.xml b/Open-ILS/examples/fm_IDL.xml
index f7843ba..2fe07f9 100644
--- a/Open-ILS/examples/fm_IDL.xml
+++ b/Open-ILS/examples/fm_IDL.xml
@@ -3106,10 +3106,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
<class id="cust" controller="open-ils.cstore open-ils.pcrud" oils_obj:fieldmapper="config::usr_setting_type" oils_persist:tablename="config.usr_setting_type" reporter:label="User Setting Type">
<fields oils_persist:primary="name">
<field name="name" reporter:label="Name" reporter:datatype="text"/>
- <field name="label" reporter:label="Label" reporter:datatype="text"/>
- <field name="description" reporter:label="Description" reporter:datatype="text"/>
+ <field name="label" reporter:label="Label" reporter:datatype="text" oils_persist:i18n="true"/>
+ <field name="description" reporter:label="Description" reporter:datatype="text" oils_persist:i18n="true"/>
<field name="datatype" reporter:label="Datatype" reporter:datatype="text"/>
- <field name="fm_class" reporter:label="Fielmapper Class" reporter:datatype="text"/>
+ <field name="fm_class" reporter:label="Fieldmapper Class" reporter:datatype="text"/>
<field name="grp" reporter:label="Settings Group" reporter:datatype="link"/>
<field name="opac_visible" reporter:label="OPAC/Patron Visible" reporter:datatype="bool"/>
<field name="reg_default" reporter:label="Registration Default" reporter:datatype="text"/>
@@ -3130,8 +3130,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
<class id="coust" controller="open-ils.cstore open-ils.pcrud" oils_obj:fieldmapper="config::org_unit_setting_type" oils_persist:tablename="config.org_unit_setting_type" reporter:label="Organizational Unit Setting Type">
<fields oils_persist:primary="name">
<field name="name" reporter:datatype="text"/>
- <field name="label" reporter:datatype="text"/>
- <field name="description" reporter:datatype="text"/>
+ <field name="label" reporter:datatype="text" oils_persist:i18n="true"/>
+ <field name="description" reporter:datatype="text" oils_persist:i18n="true"/>
<field name="datatype" reporter:datatype="text"/>
<field name="view_perm" reporter:datatype="link"/>
<field name="update_perm" reporter:datatype="link"/>
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/examples/fm_IDL.xml | 10 +++---
Open-ILS/src/sql/Pg/950.data.seed-values.sql | 45 ++++++++++++++++++++-----
2 files changed, 41 insertions(+), 14 deletions(-)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list