Merge pull request #998 from jackyq2015/issue-980

Add I18N for "on error" - fixes #980
This commit is contained in:
Tom Morris 2015-05-02 00:31:27 -04:00
commit 8540a628c9
2 changed files with 2 additions and 1 deletions

View File

@ -55,6 +55,7 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
var elmts = DOM.bind(frame); var elmts = DOM.bind(frame);
elmts.dialogHeader.text($.i18n._('core-views')["custom-text-trans"]+" " + column.name); elmts.dialogHeader.text($.i18n._('core-views')["custom-text-trans"]+" " + column.name);
elmts.or_views_errorOn.text($.i18n._('core-views')["on-error"]);
elmts.or_views_keepOr.text($.i18n._('core-views')["keep-or"]); elmts.or_views_keepOr.text($.i18n._('core-views')["keep-or"]);
elmts.or_views_setBlank.text($.i18n._('core-views')["set-blank"]); elmts.or_views_setBlank.text($.i18n._('core-views')["set-blank"]);
elmts.or_views_storeErr.text($.i18n._('core-views')["store-err"]); elmts.or_views_storeErr.text($.i18n._('core-views')["store-err"]);

View File

@ -5,7 +5,7 @@
<div class="grid-layout layout-tight layout-full"><table> <div class="grid-layout layout-tight layout-full"><table>
<tr><td colspan="3">$EXPRESSION_PREVIEW_WIDGET$</td></tr> <tr><td colspan="3">$EXPRESSION_PREVIEW_WIDGET$</td></tr>
<tr> <tr>
<td>On error</td> <td><label bind="or_views_errorOn"></label></td>
<td> <td>
<input type="radio" name="text-transform-dialog-onerror-choice" value="keep-original" checked id="$text-transform-error-keep-original" /> <input type="radio" name="text-transform-dialog-onerror-choice" value="keep-original" checked id="$text-transform-error-keep-original" />
<label for="$text-transform-error-keep-original" bind="or_views_keepOr"></label><br/> <label for="$text-transform-error-keep-original" bind="or_views_keepOr"></label><br/>