From 07d9fd2d67924a59b48d9a36144c07e5c2bfd91e Mon Sep 17 00:00:00 2001 From: Alan Bell <alanbell@ubuntu.com> Date: Wed, 15 Jun 2016 10:07:47 +0100 Subject: [PATCH] spell separator correctly fix #193 --- languages/de_de/Users.php | 4 ++-- languages/en_gb/Users.php | 4 ++-- languages/en_us/Users.php | 6 +++--- languages/en_us/Vtiger.php | 4 ++-- languages/es_mx/Users.php | 4 ++-- languages/fr_fr/Users.php | 4 ++-- languages/hu_hu/Users.php | 4 ++-- languages/it_it/Users.php | 4 ++-- languages/nl_nl/Users.php | 4 ++-- languages/pl_pl/Users.php | 4 ++-- languages/pt_br/Users.php | 4 ++-- languages/ro_ro/Users.php | 4 ++-- languages/ru_ru/Users.php | 4 ++-- languages/tr_tr/Users.php | 4 ++-- layouts/vlayout/modules/PriceBooks/ListPriceUpdate.tpl | 2 +- .../modules/PriceBooks/ProductPriceBookPopupContents.tpl | 2 +- layouts/vlayout/modules/Products/MoreCurrenciesList.tpl | 2 +- .../modules/Products/PriceBookProductPopupContents.tpl | 2 +- layouts/vlayout/modules/Settings/LayoutEditor/FieldUi.tpl | 2 +- layouts/vlayout/modules/Settings/LayoutEditor/Index.tpl | 4 ++-- .../vlayout/modules/Settings/Webforms/resources/Field.js | 2 +- layouts/vlayout/modules/Users/resources/Edit.js | 2 +- layouts/vlayout/modules/Users/resources/PreferenceEdit.js | 6 +++--- layouts/vlayout/modules/Vtiger/resources/AdvanceFilter.js | 4 ++-- layouts/vlayout/modules/Vtiger/uitypes/Currency.tpl | 6 +++--- layouts/vlayout/skins/style.less | 2 +- .../HTMLPurifier/ConfigSchema/schema/Attr.IDPrefixLocal.txt | 2 +- libraries/htmlpurifier/library/HTMLPurifier/ContentSets.php | 2 +- modules/Vtiger/helpers/Util.php | 4 ++-- modules/Vtiger/models/Field.php | 4 ++-- .../modules/Webforms/settings/templates/resources/Field.js | 2 +- pkg/vtiger/translations/Arabic_ar_ae/modules/Users.php | 4 ++-- .../BrazilianLanguagePack_bz_bz/modules/Users.php | 4 ++-- .../BritishLanguagePack_br_br/modules/Users.php | 4 ++-- pkg/vtiger/translations/Deutsch/modules/Users.php | 4 ++-- pkg/vtiger/translations/Dutch/modules/Users.php | 4 ++-- pkg/vtiger/translations/French/modules/Users.php | 4 ++-- pkg/vtiger/translations/Hungarian/modules/Users.php | 4 ++-- .../ItalianLanguagePack_it_it/modules/Users.php | 4 ++-- .../MexicanSpanishLanguagePack_es_mx/modules/Users.php | 4 ++-- .../translations/PolishLanguagePack_pl_pl/modules/Users.php | 4 ++-- .../RomanianLanguagePack_rm_rm/modules/Users.php | 4 ++-- pkg/vtiger/translations/Russian/modules/Users.php | 4 ++-- .../TurkishLanguagePack_tr_tr/modules/Users.php | 4 ++-- vtlib/thirdparty/parser/feed/simplepie.inc | 2 +- 45 files changed, 81 insertions(+), 81 deletions(-) diff --git a/languages/de_de/Users.php b/languages/de_de/Users.php index f2d263ea..9cc2d698 100644 --- a/languages/de_de/Users.php +++ b/languages/de_de/Users.php @@ -207,8 +207,8 @@ $languageStrings = array( ); $jsLanguageStrings = array( - //Curency seperator validation messages - 'JS_DECIMAL_SEPERATOR_AND_GROUPING_SEPERATOR_CANT_BE_SAME' => 'Decimal seperator and Grouping seperator cant be same', + //Curency separator validation messages + 'JS_DECIMAL_SEPARATOR_AND_GROUPING_SEPARATOR_CANT_BE_SAME' => 'Decimal separator and Grouping separator cant be same', 'JS_ENTER_OLD_PASSWORD'=>'Please enter your old password.', 'JS_ENTER_NEW_PASSWORD'=>'Please enter your new password.', 'JS_ENTER_CONFIRMATION_PASSWORD'=>'Please enter your password confirmation.', diff --git a/languages/en_gb/Users.php b/languages/en_gb/Users.php index 4b49ee4d..edbf3790 100644 --- a/languages/en_gb/Users.php +++ b/languages/en_gb/Users.php @@ -205,8 +205,8 @@ $languageStrings = array( ); $jsLanguageStrings = array( - //Curency seperator validation messages - 'JS_DECIMAL_SEPERATOR_AND_GROUPING_SEPERATOR_CANT_BE_SAME' => 'Decimal seperator and Grouping seperator can\'t be the same', + //Curency separator validation messages + 'JS_DECIMAL_SEPARATOR_AND_GROUPING_SEPARATOR_CANT_BE_SAME' => 'Decimal separator and Grouping separator can\'t be the same', 'JS_ENTER_OLD_PASSWORD'=>'Please enter your old password.', 'JS_ENTER_NEW_PASSWORD'=>'Please enter your new password.', 'JS_ENTER_CONFIRMATION_PASSWORD'=>'Please enter your password confirmation.', diff --git a/languages/en_us/Users.php b/languages/en_us/Users.php index dc044f21..eab9b65b 100644 --- a/languages/en_us/Users.php +++ b/languages/en_us/Users.php @@ -246,13 +246,13 @@ $languageStrings = array( 'Asia/Magadan' => '(UTC+12:00) Magadan', 'Pacific/Tongatapu' => '(UTC+13:00) Nukualofa', - // currency seperatar in user preferance + // currency separator in user preferance 'LBL_Space' => 'Space', ); $jsLanguageStrings = array( - //Curency seperator validation messages - 'JS_DECIMAL_SEPERATOR_AND_GROUPING_SEPERATOR_CANT_BE_SAME' => 'Decimal seperator and Grouping seperator cant be same', + //Curency separator validation messages + 'JS_DECIMAL_SEPARATOR_AND_GROUPING_SEPARATOR_CANT_BE_SAME' => 'Decimal separator and Grouping separator cant be same', 'JS_ENTER_CONFIRMATION_PASSWORD'=>'Please enter your password confirmation.', 'JS_ENTER_NEW_PASSWORD'=>'Please enter your new password.', 'JS_ENTER_OLD_PASSWORD'=>'Please enter your old password.', diff --git a/languages/en_us/Vtiger.php b/languages/en_us/Vtiger.php index 1d71eea1..902afa0d 100644 --- a/languages/en_us/Vtiger.php +++ b/languages/en_us/Vtiger.php @@ -764,7 +764,7 @@ $jsLanguageStrings = array( 'JS_VALUE_SHOULD_NOT_BE_LESS_THAN' => 'Frequency of any cron job configured should not be less than', 'JS_YOU_ARE_IN_PAGE_NUMBER' => 'You are in page number', 'JS_YOU_CAN_SELECT_ONLY' => 'You can select only', - 'JS_DECIMAL_SEPERATOR_AND_GROUPING_SEPERATOR_CANT_BE_SAME' => 'Decimal seperator and Grouping seperator cant be same', + 'JS_DECIMAL_SEPARATOR_AND_GROUPING_SEPARATOR_CANT_BE_SAME' => 'Decimal separator and Grouping separator cant be same', 'LBL_DELETE_CONFIRMATION' => 'Are you sure you want to delete?', // This is added as duplicate as we need to show different message for different modules. Ex:Accounts has different message 'LBL_DELETE_USER_CONFIRMATION' => 'When a User is deleted, the user will be marked as "Inactive" and no new records can be assigned to the User, and the user will not be able to login. Are you sure you want to delete?', 'LBL_RESTORE_CONFIRMATION' => 'Records previously assigned to this user will not be restored. Are you sure you want to restore this user?', @@ -798,4 +798,4 @@ $jsLanguageStrings = array( //Mass edit failure 'JS_MASS_EDIT_NOT_SUCCESSFULL' => 'Mass edit of some record is not successfull', -); \ No newline at end of file +); diff --git a/languages/es_mx/Users.php b/languages/es_mx/Users.php index 8c60036c..689b6e00 100644 --- a/languages/es_mx/Users.php +++ b/languages/es_mx/Users.php @@ -200,8 +200,8 @@ $languageStrings = array( $jsLanguageStrings = array( - //Curency seperator validation messages - 'JS_DECIMAL_SEPERATOR_AND_GROUPING_SEPERATOR_CANT_BE_SAME' => 'Decimal seperator and Grouping seperator cant be same', + //Curency separator validation messages + 'JS_DECIMAL_SEPARATOR_AND_GROUPING_SEPARATOR_CANT_BE_SAME' => 'Decimal separator and Grouping separator cant be same', 'JS_ENTER_OLD_PASSWORD'=>'Please enter your old password.', 'JS_ENTER_NEW_PASSWORD'=>'Please enter your new password.', 'JS_ENTER_CONFIRMATION_PASSWORD'=>'Please enter your password confirmation.', diff --git a/languages/fr_fr/Users.php b/languages/fr_fr/Users.php index 9f5a328f..93ef8d8d 100644 --- a/languages/fr_fr/Users.php +++ b/languages/fr_fr/Users.php @@ -200,8 +200,8 @@ $languageStrings = array( $jsLanguageStrings = array( - //Curency seperator validation messages - 'JS_DECIMAL_SEPERATOR_AND_GROUPING_SEPERATOR_CANT_BE_SAME' => 'Decimal seperator and Grouping seperator cant be same', + //Curency separator validation messages + 'JS_DECIMAL_SEPARATOR_AND_GROUPING_SEPARATOR_CANT_BE_SAME' => 'Decimal separator and Grouping separator cant be same', 'JS_ENTER_OLD_PASSWORD'=>'Please enter your old password.', 'JS_ENTER_NEW_PASSWORD'=>'Please enter your new password.', 'JS_ENTER_CONFIRMATION_PASSWORD'=>'Please enter your password confirmation.', diff --git a/languages/hu_hu/Users.php b/languages/hu_hu/Users.php index 942d7f82..aa234831 100644 --- a/languages/hu_hu/Users.php +++ b/languages/hu_hu/Users.php @@ -218,8 +218,8 @@ $languageStrings = array( ); $jsLanguageStrings = array( - //Curency seperator validation messages - 'JS_DECIMAL_SEPERATOR_AND_GROUPING_SEPERATOR_CANT_BE_SAME' => 'A tizedesjel és az ezres elválasztó nem lehet ugyanaz.', + //Curency separator validation messages + 'JS_DECIMAL_SEPARATOR_AND_GROUPING_SEPARATOR_CANT_BE_SAME' => 'A tizedesjel és az ezres elválasztó nem lehet ugyanaz.', 'JS_ENTER_CONFIRMATION_PASSWORD'=>'Kérjük, hogy erÅ‘sÃtse meg a jelszavát.', 'JS_ENTER_NEW_PASSWORD'=>'Kérjük, hogy adja meg az új jelszavát.', 'JS_ENTER_OLD_PASSWORD'=>'Kérjük, hogy adja meg a régi jelszavát.', diff --git a/languages/it_it/Users.php b/languages/it_it/Users.php index d583772a..6e4994b7 100644 --- a/languages/it_it/Users.php +++ b/languages/it_it/Users.php @@ -200,8 +200,8 @@ $languageStrings = array( $jsLanguageStrings = array( - //Curency seperator validation messages - 'JS_DECIMAL_SEPERATOR_AND_GROUPING_SEPERATOR_CANT_BE_SAME' => 'Decimal seperator and Grouping seperator cant be same', + //Curency separator validation messages + 'JS_DECIMAL_SEPARATOR_AND_GROUPING_SEPARATOR_CANT_BE_SAME' => 'Decimal separator and Grouping separator cant be same', 'JS_ENTER_OLD_PASSWORD'=>'Please enter your old password.', 'JS_ENTER_NEW_PASSWORD'=>'Please enter your new password.', 'JS_ENTER_CONFIRMATION_PASSWORD'=>'Please enter your password confirmation.', diff --git a/languages/nl_nl/Users.php b/languages/nl_nl/Users.php index 828084e5..fd22a75f 100644 --- a/languages/nl_nl/Users.php +++ b/languages/nl_nl/Users.php @@ -200,8 +200,8 @@ $languageStrings = array( $jsLanguageStrings = array( - //Curency seperator validation messages - 'JS_DECIMAL_SEPERATOR_AND_GROUPING_SEPERATOR_CANT_BE_SAME' => 'Decimal seperator and Grouping seperator cant be same', + //Curency separator validation messages + 'JS_DECIMAL_SEPARATOR_AND_GROUPING_SEPARATOR_CANT_BE_SAME' => 'Decimal separator and Grouping separator cant be same', 'JS_ENTER_OLD_PASSWORD'=>'Please enter your old password.', 'JS_ENTER_NEW_PASSWORD'=>'Please enter your new password.', 'JS_ENTER_CONFIRMATION_PASSWORD'=>'Please enter your password confirmation.', diff --git a/languages/pl_pl/Users.php b/languages/pl_pl/Users.php index 04e85bb5..7c3abe08 100644 --- a/languages/pl_pl/Users.php +++ b/languages/pl_pl/Users.php @@ -231,8 +231,8 @@ $languageStrings = array( $jsLanguageStrings = array( - //Curency seperator validation messages - 'JS_DECIMAL_SEPERATOR_AND_GROUPING_SEPERATOR_CANT_BE_SAME' => 'Decimal seperator and Grouping seperator cant be same', + //Curency separator validation messages + 'JS_DECIMAL_SEPARATOR_AND_GROUPING_SEPARATOR_CANT_BE_SAME' => 'Decimal separator and Grouping separator cant be same', 'JS_ENTER_OLD_PASSWORD'=>'Wpisz swoje stare hasÅ‚o.', 'JS_ENTER_NEW_PASSWORD'=>'Wpisz nowe hasÅ‚o.', 'JS_ENTER_CONFIRMATION_PASSWORD'=>'Wpisz potwierdzenie nowego hasÅ‚a.', diff --git a/languages/pt_br/Users.php b/languages/pt_br/Users.php index 4d710c15..41bd301d 100644 --- a/languages/pt_br/Users.php +++ b/languages/pt_br/Users.php @@ -200,8 +200,8 @@ $languageStrings = array( $jsLanguageStrings = array( - //Curency seperator validation messages - 'JS_DECIMAL_SEPERATOR_AND_GROUPING_SEPERATOR_CANT_BE_SAME' => 'Decimal seperator and Grouping seperator cant be same', + //Curency separator validation messages + 'JS_DECIMAL_SEPARATOR_AND_GROUPING_SEPARATOR_CANT_BE_SAME' => 'Decimal separator and Grouping separator cant be same', 'JS_ENTER_OLD_PASSWORD'=>'Please enter your old password.', 'JS_ENTER_NEW_PASSWORD'=>'Please enter your new password.', 'JS_ENTER_CONFIRMATION_PASSWORD'=>'Please enter your password confirmation.', diff --git a/languages/ro_ro/Users.php b/languages/ro_ro/Users.php index 499ae851..c61524dd 100644 --- a/languages/ro_ro/Users.php +++ b/languages/ro_ro/Users.php @@ -200,8 +200,8 @@ $languageStrings = array( $jsLanguageStrings = array( - //Curency seperator validation messages - 'JS_DECIMAL_SEPERATOR_AND_GROUPING_SEPERATOR_CANT_BE_SAME' => 'Decimal seperator and Grouping seperator cant be same', + //Curency separator validation messages + 'JS_DECIMAL_SEPARATOR_AND_GROUPING_SEPARATOR_CANT_BE_SAME' => 'Decimal separator and Grouping separator cant be same', 'JS_ENTER_OLD_PASSWORD'=>'Please enter your old password.', 'JS_ENTER_NEW_PASSWORD'=>'Please enter your new password.', 'JS_ENTER_CONFIRMATION_PASSWORD'=>'Please enter your password confirmation.', diff --git a/languages/ru_ru/Users.php b/languages/ru_ru/Users.php index fd2afa16..7cde4578 100644 --- a/languages/ru_ru/Users.php +++ b/languages/ru_ru/Users.php @@ -200,8 +200,8 @@ $languageStrings = array( $jsLanguageStrings = array( - //Curency seperator validation messages - 'JS_DECIMAL_SEPERATOR_AND_GROUPING_SEPERATOR_CANT_BE_SAME' => 'Decimal seperator and Grouping seperator cant be same', + //Curency separator validation messages + 'JS_DECIMAL_SEPARATOR_AND_GROUPING_SEPARATOR_CANT_BE_SAME' => 'Decimal separator and Grouping separator cant be same', 'JS_ENTER_OLD_PASSWORD'=>'Please enter your old password.', 'JS_ENTER_NEW_PASSWORD'=>'Please enter your new password.', 'JS_ENTER_CONFIRMATION_PASSWORD'=>'Please enter your password confirmation.', diff --git a/languages/tr_tr/Users.php b/languages/tr_tr/Users.php index c4d91a90..bb94df39 100644 --- a/languages/tr_tr/Users.php +++ b/languages/tr_tr/Users.php @@ -200,8 +200,8 @@ $languageStrings = array( $jsLanguageStrings = array( - //Curency seperator validation messages - 'JS_DECIMAL_SEPERATOR_AND_GROUPING_SEPERATOR_CANT_BE_SAME' => 'Decimal seperator and Grouping seperator cant be same', + //Curency separator validation messages + 'JS_DECIMAL_SEPARATOR_AND_GROUPING_SEPARATOR_CANT_BE_SAME' => 'Decimal separator and Grouping separator cant be same', 'JS_ENTER_OLD_PASSWORD'=>'Please enter your old password.', 'JS_ENTER_NEW_PASSWORD'=>'Please enter your new password.', 'JS_ENTER_CONFIRMATION_PASSWORD'=>'Please enter your password confirmation.', diff --git a/layouts/vlayout/modules/PriceBooks/ListPriceUpdate.tpl b/layouts/vlayout/modules/PriceBooks/ListPriceUpdate.tpl index f94cb2f5..40e94384 100644 --- a/layouts/vlayout/modules/PriceBooks/ListPriceUpdate.tpl +++ b/layouts/vlayout/modules/PriceBooks/ListPriceUpdate.tpl @@ -25,7 +25,7 @@ <span><strong>{vtranslate('LBL_EDIT_LIST_PRICE',$MODULE)}</strong></span> : <input type="text" name="currentPrice" value="{$CURRENT_PRICE}" data-validation-engine="validate[required,funcCall[Vtiger_Currency_Validator_Js.invokeValidation]]" - data-decimal-seperator='{$USER_MODEL->get('currency_decimal_separator')}' data-group-seperator='{$USER_MODEL->get('currency_grouping_separator')}' /> + data-decimal-separator='{$USER_MODEL->get('currency_decimal_separator')}' data-group-separator='{$USER_MODEL->get('currency_grouping_separator')}' /> </div> </div> {include file='ModalFooter.tpl'|@vtemplate_path:$MODULE} diff --git a/layouts/vlayout/modules/PriceBooks/ProductPriceBookPopupContents.tpl b/layouts/vlayout/modules/PriceBooks/ProductPriceBookPopupContents.tpl index 46040879..1d7555b1 100755 --- a/layouts/vlayout/modules/PriceBooks/ProductPriceBookPopupContents.tpl +++ b/layouts/vlayout/modules/PriceBooks/ProductPriceBookPopupContents.tpl @@ -62,7 +62,7 @@ <td class="listViewEntryValue {$WIDTHTYPE}"> <div class="row-fluid"> <input type="text" value="{$LISTVIEW_ENTRY->get('unit_price')}" name="listPrice" class="invisible span10 zeroPaddingAndMargin" data-validation-engine="validate[required,funcCall[Vtiger_Currency_Validator_Js.invokeValidation]]" - data-decimal-seperator='{$USER_MODEL->get('currency_decimal_separator')}' data-group-seperator='{$USER_MODEL->get('currency_grouping_separator')}'/> + data-decimal-separator='{$USER_MODEL->get('currency_decimal_separator')}' data-group-separator='{$USER_MODEL->get('currency_grouping_separator')}'/> </div> </td> </tr> diff --git a/layouts/vlayout/modules/Products/MoreCurrenciesList.tpl b/layouts/vlayout/modules/Products/MoreCurrenciesList.tpl index 8e50451a..043bfc86 100644 --- a/layouts/vlayout/modules/Products/MoreCurrenciesList.tpl +++ b/layouts/vlayout/modules/Products/MoreCurrenciesList.tpl @@ -51,7 +51,7 @@ </td> <td> <div class="row-fluid"> - <input {$disable_value} type="text" size="10" class="span9 convertedPrice" name="{$price.curname}" id="{$price.curname}" value="{$price.curvalue}" data-validation-engine="validate[funcCall[Vtiger_Currency_Validator_Js.invokeValidation]]" data-decimal-seperator='{$USER_MODEL->get('currency_decimal_separator')}' data-group-seperator='{$USER_MODEL->get('currency_grouping_separator')}' /> + <input {$disable_value} type="text" size="10" class="span9 convertedPrice" name="{$price.curname}" id="{$price.curname}" value="{$price.curvalue}" data-validation-engine="validate[funcCall[Vtiger_Currency_Validator_Js.invokeValidation]]" data-decimal-separator='{$USER_MODEL->get('currency_decimal_separator')}' data-group-separator='{$USER_MODEL->get('currency_grouping_separator')}' /> </div> </td> <td> diff --git a/layouts/vlayout/modules/Products/PriceBookProductPopupContents.tpl b/layouts/vlayout/modules/Products/PriceBookProductPopupContents.tpl index a3622b42..fda05f60 100644 --- a/layouts/vlayout/modules/Products/PriceBookProductPopupContents.tpl +++ b/layouts/vlayout/modules/Products/PriceBookProductPopupContents.tpl @@ -58,7 +58,7 @@ <td class="listViewEntryValue {$WIDTHTYPE}"> <div class="row-fluid"> <input type="text" value="{$LISTVIEW_ENTRY->get('unit_price')}" name="listPrice" class="invisible span10 zeroPaddingAndMargin" data-validation-engine="validate[required,funcCall[Vtiger_Currency_Validator_Js.invokeValidation]]" - data-decimal-seperator='{$USER_MODEL->get('currency_decimal_separator')}' data-group-seperator='{$USER_MODEL->get('currency_grouping_separator')}'/> + data-decimal-separator='{$USER_MODEL->get('currency_decimal_separator')}' data-group-separator='{$USER_MODEL->get('currency_grouping_separator')}'/> </div> </td> </tr> diff --git a/layouts/vlayout/modules/Settings/LayoutEditor/FieldUi.tpl b/layouts/vlayout/modules/Settings/LayoutEditor/FieldUi.tpl index ec34f9c5..c10894e1 100644 --- a/layouts/vlayout/modules/Settings/LayoutEditor/FieldUi.tpl +++ b/layouts/vlayout/modules/Settings/LayoutEditor/FieldUi.tpl @@ -105,7 +105,7 @@ <span class="add-on">{$USER_MODEL->get('currency_symbol')}</span> <input type="text" class="input-medium" name="fieldDefaultValue" {if !$FIELD_MODEL->hasDefaultValue()} disabled="" {/if} data-validation-engine="validate[required,funcCall[Vtiger_Base_Validator_Js.invokeValidation]]" data-fieldinfo='{ZEND_JSON::encode($FIELD_INFO)}' value="{$FIELD_MODEL->getEditViewDisplayValue($FIELD_MODEL->get('defaultvalue'))}" - data-decimal-seperator='{$USER_MODEL->get('currency_decimal_separator')}' data-group-seperator='{$USER_MODEL->get('currency_grouping_separator')}' /> + data-decimal-separator='{$USER_MODEL->get('currency_decimal_separator')}' data-group-separator='{$USER_MODEL->get('currency_grouping_separator')}' /> </div> {else} <input type="text" {if !$FIELD_MODEL->hasDefaultValue()} disabled="" {/if} data-validation-engine="validate[required,funcCall[Vtiger_Base_Validator_Js.invokeValidation]]" class="input-medium" name="fieldDefaultValue" value="{$FIELD_MODEL->get('defaultvalue')}" data-fieldinfo='{ZEND_JSON::encode($FIELD_INFO)}'/> diff --git a/layouts/vlayout/modules/Settings/LayoutEditor/Index.tpl b/layouts/vlayout/modules/Settings/LayoutEditor/Index.tpl index af3548d7..75026ae4 100644 --- a/layouts/vlayout/modules/Settings/LayoutEditor/Index.tpl +++ b/layouts/vlayout/modules/Settings/LayoutEditor/Index.tpl @@ -222,7 +222,7 @@ <span class="add-on">{$USER_MODEL->get('currency_symbol')}</span> <input type="text" data-validation-engine="validate[required,funcCall[Vtiger_Base_Validator_Js.invokeValidation]]" {if !$FIELD_MODEL->hasDefaultValue()} disabled="" {/if} class="input-medium" name="fieldDefaultValue" data-fieldinfo='{ZEND_JSON::encode($FIELD_INFO)}' value="{$FIELD_MODEL->getEditViewDisplayValue($FIELD_MODEL->get('defaultvalue'))}" - data-decimal-seperator='{$USER_MODEL->get('currency_decimal_separator')}' data-group-seperator='{$USER_MODEL->get('currency_grouping_separator')}' /> + data-decimal-separator='{$USER_MODEL->get('currency_decimal_separator')}' data-group-separator='{$USER_MODEL->get('currency_grouping_separator')}' /> </div> {else if $FIELD_MODEL->getFieldName() eq "terms_conditions" && $FIELD_MODEL->get('uitype') == 19} {assign var=INVENTORY_TERMS_AND_CONDITIONS_MODEL value= Settings_Vtiger_MenuItem_Model::getInstance("INVENTORYTERMSANDCONDITIONS")} @@ -387,7 +387,7 @@ <span class="add-on">{$USER_MODEL->get('currency_symbol')}</span> <input type="text" data-validation-engine="validate[required,funcCall[Vtiger_Base_Validator_Js.invokeValidation]]" {if !$FIELD_MODEL->hasDefaultValue()} disabled="" {/if} class="input-medium" name="fieldDefaultValue" data-fieldinfo='{ZEND_JSON::encode($FIELD_INFO)}' value="{$FIELD_MODEL->getEditViewDisplayValue($FIELD_MODEL->get('defaultvalue'))}" - data-decimal-seperator='{$USER_MODEL->get('currency_decimal_separator')}' data-group-seperator='{$USER_MODEL->get('currency_grouping_separator')}' /> + data-decimal-separator='{$USER_MODEL->get('currency_decimal_separator')}' data-group-separator='{$USER_MODEL->get('currency_grouping_separator')}' /> </div> {else} <input type="text" class="input-medium" data-validation-engine="validate[required,funcCall[Vtiger_Base_Validator_Js.invokeValidation]]" {if !$FIELD_MODEL->hasDefaultValue()} disabled="" {/if} name="fieldDefaultValue" value="{$FIELD_MODEL->get('defaultvalue')}" data-fieldinfo='{ZEND_JSON::encode($FIELD_INFO)}'/> diff --git a/layouts/vlayout/modules/Settings/Webforms/resources/Field.js b/layouts/vlayout/modules/Settings/Webforms/resources/Field.js index 7220fb1d..a8d0027b 100755 --- a/layouts/vlayout/modules/Settings/Webforms/resources/Field.js +++ b/layouts/vlayout/modules/Settings/Webforms/resources/Field.js @@ -108,7 +108,7 @@ Vtiger_Field_Js('Webforms_Currency_Field_Js',{},{ getUi : function() { var html = '<div class="input-prepend">'+ '<span class="add-on">'+ this.getCurrencySymbol()+'</span>'+ - '<input type="text" name="'+ this.getName() +'" value="'+ this.getValue() + '" class="input-medium" style="width:210px" data-decimal-seperator="'+this.getData().decimalSeperator+'" data-group-seperator="'+this.getData().groupSeperator+'"/>'+ + '<input type="text" name="'+ this.getName() +'" value="'+ this.getValue() + '" class="input-medium" style="width:210px" data-decimal-separator="'+this.getData().decimalSeperator+'" data-group-separator="'+this.getData().groupSeperator+'"/>'+ '</div>'; var element = jQuery(html); return this.addValidationToElement(element); diff --git a/layouts/vlayout/modules/Users/resources/Edit.js b/layouts/vlayout/modules/Users/resources/Edit.js index 23029954..2474cbec 100644 --- a/layouts/vlayout/modules/Users/resources/Edit.js +++ b/layouts/vlayout/modules/Users/resources/Edit.js @@ -70,7 +70,7 @@ Vtiger_Edit_Js("Users_Edit_Js",{},{ var groupingSeperatorValue = jQuery('[name="currency_grouping_separator"]', form).val(); var decimalSeperatorValue = jQuery('[name="currency_decimal_separator"]', form).val(); if(groupingSeperatorValue == decimalSeperatorValue){ - Vtiger_Helper_Js.showPnotify(app.vtranslate('JS_DECIMAL_SEPERATOR_AND_GROUPING_SEPERATOR_CANT_BE_SAME')); + Vtiger_Helper_Js.showPnotify(app.vtranslate('JS_DECIMAL_SEPARATOR_AND_GROUPING_SEPARATOR_CANT_BE_SAME')); e.preventDefault(); } var userName = jQuery('input[name="user_name"]').val(); diff --git a/layouts/vlayout/modules/Users/resources/PreferenceEdit.js b/layouts/vlayout/modules/Users/resources/PreferenceEdit.js index ebfee433..344a365c 100644 --- a/layouts/vlayout/modules/Users/resources/PreferenceEdit.js +++ b/layouts/vlayout/modules/Users/resources/PreferenceEdit.js @@ -10,7 +10,7 @@ Users_Edit_Js("Users_PreferenceEdit_Js",{ /** - * Function to register change event for currency seperator + * Function to register change event for currency separator */ registerChangeEventForCurrencySeperator : function(){ var form = jQuery('form'); @@ -19,7 +19,7 @@ Users_Edit_Js("Users_PreferenceEdit_Js",{ var selectedValue = element.val(); var groupingSeperatorValue = jQuery('[name="currency_grouping_separator"]',form).data('selectedValue'); if(groupingSeperatorValue == selectedValue){ - var message = app.vtranslate('JS_DECIMAL_SEPERATOR_AND_GROUPING_SEPERATOR_CANT_BE_SAME'); + var message = app.vtranslate('JS_DECIMAL_SEPARATOR_AND_GROUPING_SEPARATOR_CANT_BE_SAME'); var params = { text: message, type: 'error' @@ -38,7 +38,7 @@ Users_Edit_Js("Users_PreferenceEdit_Js",{ var selectedValue = element.val(); var decimalSeperatorValue = jQuery('[name="currency_decimal_separator"]',form).data('selectedValue'); if(decimalSeperatorValue == selectedValue){ - var message = app.vtranslate('JS_DECIMAL_SEPERATOR_AND_GROUPING_SEPERATOR_CANT_BE_SAME'); + var message = app.vtranslate('JS_DECIMAL_SEPARATOR_AND_GROUPING_SEPARATOR_CANT_BE_SAME'); var params = { text: message, type: 'error' diff --git a/layouts/vlayout/modules/Vtiger/resources/AdvanceFilter.js b/layouts/vlayout/modules/Vtiger/resources/AdvanceFilter.js index 0170d324..a951585b 100644 --- a/layouts/vlayout/modules/Vtiger/resources/AdvanceFilter.js +++ b/layouts/vlayout/modules/Vtiger/resources/AdvanceFilter.js @@ -309,8 +309,8 @@ jQuery.Class("Vtiger_AdvanceFilter_Js",{ fieldSpecificUi.find('[name="'+ fieldName +'"]').attr('data-value','value').removeAttr('data-validation-engine'); if(fieldModel.getType() == 'currency') { - fieldSpecificUi.filter('[name="'+ fieldName +'"]').attr('data-decimal-seperator', fieldInfo.decimal_seperator).attr('data-group-seperator', fieldInfo.group_seperator); - fieldSpecificUi.find('[name="'+ fieldName +'"]').attr('data-decimal-seperator', fieldInfo.decimal_seperator).attr('data-group-seperator', fieldInfo.group_seperator); + fieldSpecificUi.filter('[name="'+ fieldName +'"]').attr('data-decimal-separator', fieldInfo.decimal_separator).attr('data-group-separator', fieldInfo.group_separator); + fieldSpecificUi.find('[name="'+ fieldName +'"]').attr('data-decimal-separator', fieldInfo.decimal_separator).attr('data-group-separator', fieldInfo.group_separator); } fieldUiHolder.html(fieldSpecificUi); diff --git a/layouts/vlayout/modules/Vtiger/uitypes/Currency.tpl b/layouts/vlayout/modules/Vtiger/uitypes/Currency.tpl index 139cb21e..d60d8ae3 100644 --- a/layouts/vlayout/modules/Vtiger/uitypes/Currency.tpl +++ b/layouts/vlayout/modules/Vtiger/uitypes/Currency.tpl @@ -19,7 +19,7 @@ <span class="add-on">{$USER_MODEL->get('currency_symbol')}</span> <input id="{$MODULE}_editView_fieldName_{$FIELD_NAME}" type="text" class="input-medium currencyField" data-validation-engine="validate[{if $FIELD_MODEL->isMandatory() eq true} required,{/if}funcCall[Vtiger_Base_Validator_Js.invokeValidation]]" name="{$FIELD_MODEL->getFieldName()}" data-fieldinfo='{$FIELD_INFO}' value="{$FIELD_MODEL->getEditViewDisplayValue($FIELD_MODEL->get('fieldvalue'))}" {if !empty($SPECIAL_VALIDATOR)}data-validator='{Zend_Json::encode($SPECIAL_VALIDATOR)}'{/if} - data-decimal-seperator='{$USER_MODEL->get('currency_decimal_separator')}' data-group-seperator='{$USER_MODEL->get('currency_grouping_separator')}' data-number-of-decimal-places='{$USER_MODEL->get('no_of_currency_decimals')}'/> + data-decimal-separator='{$USER_MODEL->get('currency_decimal_separator')}' data-group-separator='{$USER_MODEL->get('currency_grouping_separator')}' data-number-of-decimal-places='{$USER_MODEL->get('no_of_currency_decimals')}'/> </div> {else if ($FIELD_MODEL->get('uitype') eq '72') && ($FIELD_MODEL->getName() eq 'unit_price')} <div class="input-prepend"> @@ -30,7 +30,7 @@ <span class="span10 row-fluid"> <input id="{$MODULE}-editview-fieldname-{$FIELD_NAME}" type="text" class="span6 unitPrice currencyField" name="{$FIELD_MODEL->getFieldName()}" data-validation-engine="validate[{if $FIELD_MODEL->isMandatory() eq true} required,{/if}funcCall[Vtiger_Base_Validator_Js.invokeValidation]]" data-fieldinfo='{$FIELD_INFO}' value="{$FIELD_MODEL->getDisplayValue($FIELD_MODEL->get('fieldvalue'))}" {if !empty($SPECIAL_VALIDATOR)}data-validator='{Zend_Json::encode($SPECIAL_VALIDATOR)}'{/if} - data-decimal-seperator='{$USER_MODEL->get('currency_decimal_separator')}' data-group-seperator='{$USER_MODEL->get('currency_grouping_separator')}' data-number-of-decimal-places='{$USER_MODEL->get('no_of_currency_decimals')}'/> + data-decimal-separator='{$USER_MODEL->get('currency_decimal_separator')}' data-group-separator='{$USER_MODEL->get('currency_grouping_separator')}' data-number-of-decimal-places='{$USER_MODEL->get('no_of_currency_decimals')}'/> {assign var=VIEW_NAME value={getPurifiedSmartyParameters('view')}} {if $VIEW_NAME eq 'Edit'} <a id="moreCurrencies" class="span cursorPointer">{vtranslate('LBL_MORE_CURRENCIES', $MODULE)}>></a> @@ -47,7 +47,7 @@ <div class="row-fluid"> <span class="span1"><span class="add-on row-fluid">{$USER_MODEL->get('currency_symbol')}</span></span> <span class="span7"><input type="text" class="row-fluid currencyField" name="{$FIELD_MODEL->getFieldName()}" data-validation-engine="validate[{if $FIELD_MODEL->isMandatory() eq true} required,{/if}funcCall[Vtiger_Base_Validator_Js.invokeValidation]]" - data-fieldinfo='{$FIELD_INFO}' value="{$FIELD_MODEL->getEditViewDisplayValue($FIELD_MODEL->get('fieldvalue'))}" {if !empty($SPECIAL_VALIDATOR)}data-validator={Zend_Json::encode($SPECIAL_VALIDATOR)}{/if} data-decimal-seperator='{$USER_MODEL->get('currency_decimal_separator')}' data-group-seperator='{$USER_MODEL->get('currency_grouping_separator')}' /></span> + data-fieldinfo='{$FIELD_INFO}' value="{$FIELD_MODEL->getEditViewDisplayValue($FIELD_MODEL->get('fieldvalue'))}" {if !empty($SPECIAL_VALIDATOR)}data-validator={Zend_Json::encode($SPECIAL_VALIDATOR)}{/if} data-decimal-separator='{$USER_MODEL->get('currency_decimal_separator')}' data-group-separator='{$USER_MODEL->get('currency_grouping_separator')}' /></span> </div> </div> {/if} diff --git a/layouts/vlayout/skins/style.less b/layouts/vlayout/skins/style.less index 59b3ab0e..77489274 100644 --- a/layouts/vlayout/skins/style.less +++ b/layouts/vlayout/skins/style.less @@ -3167,7 +3167,7 @@ input[type="text"], input, textarea{ .unselectedCell { background-color: @grayLighter; - color: @seperatorColor; + color: @separatorColor; white-space : nowrap; } diff --git a/libraries/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefixLocal.txt b/libraries/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefixLocal.txt index 2c5924a7..0ac0da18 100644 --- a/libraries/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefixLocal.txt +++ b/libraries/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefixLocal.txt @@ -9,6 +9,6 @@ have a seperate prefix that changes with each iteration. This way, seperately submitted user content displayed on the same page doesn't clobber each other. Ideal values are unique identifiers for the content it represents (i.e. the id of the row in the database). Be sure to add a -seperator (like an underscore) at the end. Warning: this directive will +separator (like an underscore) at the end. Warning: this directive will not work unless %Attr.IDPrefix is set to a non-empty value! --# vim: et sw=4 sts=4 diff --git a/libraries/htmlpurifier/library/HTMLPurifier/ContentSets.php b/libraries/htmlpurifier/library/HTMLPurifier/ContentSets.php index 3b6e96f5..ad60d999 100644 --- a/libraries/htmlpurifier/library/HTMLPurifier/ContentSets.php +++ b/libraries/htmlpurifier/library/HTMLPurifier/ContentSets.php @@ -7,7 +7,7 @@ class HTMLPurifier_ContentSets { /** - * List of content set strings (pipe seperators) indexed by name. + * List of content set strings (pipe separators) indexed by name. */ public $info = array(); diff --git a/modules/Vtiger/helpers/Util.php b/modules/Vtiger/helpers/Util.php index b1c39777..3d01000f 100644 --- a/modules/Vtiger/helpers/Util.php +++ b/modules/Vtiger/helpers/Util.php @@ -163,7 +163,7 @@ class Vtiger_Util_Helper { } } else { /** - * To support strtotime() for 'mm-dd-yyyy' format the seperator should be '/' + * To support strtotime() for 'mm-dd-yyyy' format the separator should be '/' * For more referrences * http://php.net/manual/en/datetime.formats.date.php */ @@ -220,7 +220,7 @@ class Vtiger_Util_Helper { $displayTime = $hours .':'. $minutes .' '. $meridiem; /** - * To support strtotime() for 'mm-dd-yyyy' format the seperator should be '/' + * To support strtotime() for 'mm-dd-yyyy' format the separator should be '/' * For more referrences * http://php.net/manual/en/datetime.formats.date.php */ diff --git a/modules/Vtiger/models/Field.php b/modules/Vtiger/models/Field.php index 4b181734..c912c689 100644 --- a/modules/Vtiger/models/Field.php +++ b/modules/Vtiger/models/Field.php @@ -513,8 +513,8 @@ class Vtiger_Field_Model extends Vtiger_Field { if($this->getFieldDataType() == 'currency') { $currentUser = Users_Record_Model::getCurrentUserModel(); $this->fieldInfo['currency_symbol'] = $currentUser->get('currency_symbol'); - $this->fieldInfo['decimal_seperator'] = $currentUser->get('currency_decimal_separator'); - $this->fieldInfo['group_seperator'] = $currentUser->get('currency_grouping_separator'); + $this->fieldInfo['decimal_separator'] = $currentUser->get('currency_decimal_separator'); + $this->fieldInfo['group_separator'] = $currentUser->get('currency_grouping_separator'); } if($this->getFieldDataType() == 'owner') { diff --git a/pkg/vtiger/modules/Webforms/settings/templates/resources/Field.js b/pkg/vtiger/modules/Webforms/settings/templates/resources/Field.js index 7220fb1d..a8d0027b 100644 --- a/pkg/vtiger/modules/Webforms/settings/templates/resources/Field.js +++ b/pkg/vtiger/modules/Webforms/settings/templates/resources/Field.js @@ -108,7 +108,7 @@ Vtiger_Field_Js('Webforms_Currency_Field_Js',{},{ getUi : function() { var html = '<div class="input-prepend">'+ '<span class="add-on">'+ this.getCurrencySymbol()+'</span>'+ - '<input type="text" name="'+ this.getName() +'" value="'+ this.getValue() + '" class="input-medium" style="width:210px" data-decimal-seperator="'+this.getData().decimalSeperator+'" data-group-seperator="'+this.getData().groupSeperator+'"/>'+ + '<input type="text" name="'+ this.getName() +'" value="'+ this.getValue() + '" class="input-medium" style="width:210px" data-decimal-separator="'+this.getData().decimalSeperator+'" data-group-separator="'+this.getData().groupSeperator+'"/>'+ '</div>'; var element = jQuery(html); return this.addValidationToElement(element); diff --git a/pkg/vtiger/translations/Arabic_ar_ae/modules/Users.php b/pkg/vtiger/translations/Arabic_ar_ae/modules/Users.php index a0ac0233..7b6cd873 100644 --- a/pkg/vtiger/translations/Arabic_ar_ae/modules/Users.php +++ b/pkg/vtiger/translations/Arabic_ar_ae/modules/Users.php @@ -190,8 +190,8 @@ $languageStrings = array( $jsLanguageStrings = array( - //Curency seperator validation messages - 'JS_DECIMAL_SEPERATOR_AND_GROUPING_SEPERATOR_CANT_BE_SAME' => 'Decimal seperator and Grouping seperator cant be same', + //Curency separator validation messages + 'JS_DECIMAL_SEPARATOR_AND_GROUPING_SEPARATOR_CANT_BE_SAME' => 'Decimal separator and Grouping separator cant be same', 'JS_ENTER_OLD_PASSWORD'=>'Please enter your old password.', 'JS_ENTER_NEW_PASSWORD'=>'Please enter your new password.', 'JS_ENTER_CONFIRMATION_PASSWORD'=>'Please enter your password confirmation.', diff --git a/pkg/vtiger/translations/BrazilianLanguagePack_bz_bz/modules/Users.php b/pkg/vtiger/translations/BrazilianLanguagePack_bz_bz/modules/Users.php index 5351d627..189796b8 100644 --- a/pkg/vtiger/translations/BrazilianLanguagePack_bz_bz/modules/Users.php +++ b/pkg/vtiger/translations/BrazilianLanguagePack_bz_bz/modules/Users.php @@ -266,8 +266,8 @@ $languageStrings = array( ); $jsLanguageStrings = array( - //Curency seperator validation messages - 'JS_DECIMAL_SEPERATOR_AND_GROUPING_SEPERATOR_CANT_BE_SAME' => 'O separador de casas decimais e separador de milhar não podem ser os mesmos', + //Curency separator validation messages + 'JS_DECIMAL_SEPARATOR_AND_GROUPING_SEPARATOR_CANT_BE_SAME' => 'O separador de casas decimais e separador de milhar não podem ser os mesmos', 'JS_ENTER_CONFIRMATION_PASSWORD'=>'Por favor, digite confirmação da senha.', 'JS_ENTER_NEW_PASSWORD'=>'Por favor, digite sua nova senha.', 'JS_ENTER_OLD_PASSWORD'=>'Por favor, digite sua senha antiga.', diff --git a/pkg/vtiger/translations/BritishLanguagePack_br_br/modules/Users.php b/pkg/vtiger/translations/BritishLanguagePack_br_br/modules/Users.php index cac3d37c..c9407ab5 100644 --- a/pkg/vtiger/translations/BritishLanguagePack_br_br/modules/Users.php +++ b/pkg/vtiger/translations/BritishLanguagePack_br_br/modules/Users.php @@ -204,8 +204,8 @@ $languageStrings = array( ); $jsLanguageStrings = array( - //Curency seperator validation messages - 'JS_DECIMAL_SEPERATOR_AND_GROUPING_SEPERATOR_CANT_BE_SAME' => 'Decimal seperator and Grouping seperator can\'t be the same', + //Curency separator validation messages + 'JS_DECIMAL_SEPARATOR_AND_GROUPING_SEPARATOR_CANT_BE_SAME' => 'Decimal separator and Grouping separator can\'t be the same', 'JS_ENTER_OLD_PASSWORD'=>'Please enter your old password.', 'JS_ENTER_NEW_PASSWORD'=>'Please enter your new password.', 'JS_ENTER_CONFIRMATION_PASSWORD'=>'Please enter your password confirmation.', diff --git a/pkg/vtiger/translations/Deutsch/modules/Users.php b/pkg/vtiger/translations/Deutsch/modules/Users.php index 2091c688..6928d4b4 100644 --- a/pkg/vtiger/translations/Deutsch/modules/Users.php +++ b/pkg/vtiger/translations/Deutsch/modules/Users.php @@ -206,8 +206,8 @@ $languageStrings = array( ); $jsLanguageStrings = array( - //Curency seperator validation messages - 'JS_DECIMAL_SEPERATOR_AND_GROUPING_SEPERATOR_CANT_BE_SAME' => 'Decimal seperator and Grouping seperator cant be same', + //Curency separator validation messages + 'JS_DECIMAL_SEPARATOR_AND_GROUPING_SEPARATOR_CANT_BE_SAME' => 'Decimal separator and Grouping separator cant be same', 'JS_ENTER_OLD_PASSWORD'=>'Please enter your old password.', 'JS_ENTER_NEW_PASSWORD'=>'Please enter your new password.', 'JS_ENTER_CONFIRMATION_PASSWORD'=>'Please enter your password confirmation.', diff --git a/pkg/vtiger/translations/Dutch/modules/Users.php b/pkg/vtiger/translations/Dutch/modules/Users.php index 910246ed..b6631aa7 100644 --- a/pkg/vtiger/translations/Dutch/modules/Users.php +++ b/pkg/vtiger/translations/Dutch/modules/Users.php @@ -250,8 +250,8 @@ $languageStrings['narrow'] = 'smal'; # auto added 2014-04-17 20:04:01 $jsLanguageStrings = array( - //Curency seperator validation messages - 'JS_DECIMAL_SEPERATOR_AND_GROUPING_SEPERATOR_CANT_BE_SAME' => 'Decimaal scheidingsteken en groepscheidingsteken kunnen niet hetzelfde zijn', + //Curency separator validation messages + 'JS_DECIMAL_SEPARATOR_AND_GROUPING_SEPARATOR_CANT_BE_SAME' => 'Decimaal scheidingsteken en groepscheidingsteken kunnen niet hetzelfde zijn', 'JS_ENTER_OLD_PASSWORD'=>'Voer a.u.b. uw oude wachtwoord in.', 'JS_ENTER_NEW_PASSWORD'=>'Voer a.u.b. uw nieuwe wachtwoord in.', 'JS_ENTER_CONFIRMATION_PASSWORD'=>'Voer a.u.b. nogmaals uw wachtwoord in ter bevestiging.', diff --git a/pkg/vtiger/translations/French/modules/Users.php b/pkg/vtiger/translations/French/modules/Users.php index 13a7f798..91655484 100644 --- a/pkg/vtiger/translations/French/modules/Users.php +++ b/pkg/vtiger/translations/French/modules/Users.php @@ -199,8 +199,8 @@ $languageStrings = array( $jsLanguageStrings = array( - //Curency seperator validation messages - 'JS_DECIMAL_SEPERATOR_AND_GROUPING_SEPERATOR_CANT_BE_SAME' => 'Decimal seperator and Grouping seperator cant be same', + //Curency separator validation messages + 'JS_DECIMAL_SEPARATOR_AND_GROUPING_SEPARATOR_CANT_BE_SAME' => 'Decimal separator and Grouping separator cant be same', 'JS_ENTER_OLD_PASSWORD'=>'Please enter your old password.', 'JS_ENTER_NEW_PASSWORD'=>'Please enter your new password.', 'JS_ENTER_CONFIRMATION_PASSWORD'=>'Please enter your password confirmation.', diff --git a/pkg/vtiger/translations/Hungarian/modules/Users.php b/pkg/vtiger/translations/Hungarian/modules/Users.php index e42af722..24e12990 100644 --- a/pkg/vtiger/translations/Hungarian/modules/Users.php +++ b/pkg/vtiger/translations/Hungarian/modules/Users.php @@ -217,8 +217,8 @@ $languageStrings = array( ); $jsLanguageStrings = array( - //Curency seperator validation messages - 'JS_DECIMAL_SEPERATOR_AND_GROUPING_SEPERATOR_CANT_BE_SAME' => 'A tizedesjel és az ezres elválasztó nem lehet ugyanaz.', + //Curency separator validation messages + 'JS_DECIMAL_SEPARATOR_AND_GROUPING_SEPARATOR_CANT_BE_SAME' => 'A tizedesjel és az ezres elválasztó nem lehet ugyanaz.', 'JS_ENTER_CONFIRMATION_PASSWORD'=>'Kérjük, hogy erÅ‘sÃtse meg a jelszavát.', 'JS_ENTER_NEW_PASSWORD'=>'Kérjük, hogy adja meg az új jelszavát.', 'JS_ENTER_OLD_PASSWORD'=>'Kérjük, hogy adja meg a régi jelszavát.', diff --git a/pkg/vtiger/translations/ItalianLanguagePack_it_it/modules/Users.php b/pkg/vtiger/translations/ItalianLanguagePack_it_it/modules/Users.php index 9d52ebda..1e7bdae0 100644 --- a/pkg/vtiger/translations/ItalianLanguagePack_it_it/modules/Users.php +++ b/pkg/vtiger/translations/ItalianLanguagePack_it_it/modules/Users.php @@ -199,8 +199,8 @@ $languageStrings = array( $jsLanguageStrings = array( - //Curency seperator validation messages - 'JS_DECIMAL_SEPERATOR_AND_GROUPING_SEPERATOR_CANT_BE_SAME' => 'Decimal seperator and Grouping seperator cant be same', + //Curency separator validation messages + 'JS_DECIMAL_SEPARATOR_AND_GROUPING_SEPARATOR_CANT_BE_SAME' => 'Decimal separator and Grouping separator cant be same', 'JS_ENTER_OLD_PASSWORD'=>'Please enter your old password.', 'JS_ENTER_NEW_PASSWORD'=>'Please enter your new password.', 'JS_ENTER_CONFIRMATION_PASSWORD'=>'Please enter your password confirmation.', diff --git a/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Users.php b/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Users.php index 1330a019..1af85f2d 100644 --- a/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Users.php +++ b/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Users.php @@ -211,8 +211,8 @@ $languageStrings = array( $jsLanguageStrings = array( - //Curency seperator validation messages - 'JS_DECIMAL_SEPERATOR_AND_GROUPING_SEPERATOR_CANT_BE_SAME' => 'El separador de decimales y separador de grupos no pueden ser el mismo', + //Curency separator validation messages + 'JS_DECIMAL_SEPARATOR_AND_GROUPING_SEPARATOR_CANT_BE_SAME' => 'El separador de decimales y separador de grupos no pueden ser el mismo', 'JS_ENTER_OLD_PASSWORD'=>'Ingresa tu contraseña actual.', 'JS_ENTER_NEW_PASSWORD'=>'Ingresa tu nueva contraseña.', 'JS_ENTER_CONFIRMATION_PASSWORD'=>'Confirma tu nueva contraseña.', diff --git a/pkg/vtiger/translations/PolishLanguagePack_pl_pl/modules/Users.php b/pkg/vtiger/translations/PolishLanguagePack_pl_pl/modules/Users.php index 7f69a80d..5e222cb4 100644 --- a/pkg/vtiger/translations/PolishLanguagePack_pl_pl/modules/Users.php +++ b/pkg/vtiger/translations/PolishLanguagePack_pl_pl/modules/Users.php @@ -230,8 +230,8 @@ $languageStrings = array( $jsLanguageStrings = array( - //Curency seperator validation messages - 'JS_DECIMAL_SEPERATOR_AND_GROUPING_SEPERATOR_CANT_BE_SAME' => 'Decimal seperator and Grouping seperator cant be same', + //Curency separator validation messages + 'JS_DECIMAL_SEPARATOR_AND_GROUPING_SEPARATOR_CANT_BE_SAME' => 'Decimal separator and Grouping separator cant be same', 'JS_ENTER_OLD_PASSWORD'=>'Wpisz swoje stare hasÅ‚o.', 'JS_ENTER_NEW_PASSWORD'=>'Wpisz nowe hasÅ‚o.', 'JS_ENTER_CONFIRMATION_PASSWORD'=>'Wpisz potwierdzenie nowego hasÅ‚a.', diff --git a/pkg/vtiger/translations/RomanianLanguagePack_rm_rm/modules/Users.php b/pkg/vtiger/translations/RomanianLanguagePack_rm_rm/modules/Users.php index f3ed3c8e..5885e45c 100644 --- a/pkg/vtiger/translations/RomanianLanguagePack_rm_rm/modules/Users.php +++ b/pkg/vtiger/translations/RomanianLanguagePack_rm_rm/modules/Users.php @@ -199,8 +199,8 @@ $languageStrings = array( $jsLanguageStrings = array( - //Curency seperator validation messages - 'JS_DECIMAL_SEPERATOR_AND_GROUPING_SEPERATOR_CANT_BE_SAME' => 'Decimal seperator and Grouping seperator cant be same', + //Curency separator validation messages + 'JS_DECIMAL_SEPARATOR_AND_GROUPING_SEPARATOR_CANT_BE_SAME' => 'Decimal separator and Grouping separator cant be same', 'JS_ENTER_OLD_PASSWORD'=>'Please enter your old password.', 'JS_ENTER_NEW_PASSWORD'=>'Please enter your new password.', 'JS_ENTER_CONFIRMATION_PASSWORD'=>'Please enter your password confirmation.', diff --git a/pkg/vtiger/translations/Russian/modules/Users.php b/pkg/vtiger/translations/Russian/modules/Users.php index c631269a..be77df22 100644 --- a/pkg/vtiger/translations/Russian/modules/Users.php +++ b/pkg/vtiger/translations/Russian/modules/Users.php @@ -199,8 +199,8 @@ $languageStrings = array( $jsLanguageStrings = array( - //Curency seperator validation messages - 'JS_DECIMAL_SEPERATOR_AND_GROUPING_SEPERATOR_CANT_BE_SAME' => 'Decimal seperator and Grouping seperator cant be same', + //Curency separator validation messages + 'JS_DECIMAL_SEPARATOR_AND_GROUPING_SEPARATOR_CANT_BE_SAME' => 'Decimal separator and Grouping separator cant be same', 'JS_ENTER_OLD_PASSWORD'=>'Please enter your old password.', 'JS_ENTER_NEW_PASSWORD'=>'Please enter your new password.', 'JS_ENTER_CONFIRMATION_PASSWORD'=>'Please enter your password confirmation.', diff --git a/pkg/vtiger/translations/TurkishLanguagePack_tr_tr/modules/Users.php b/pkg/vtiger/translations/TurkishLanguagePack_tr_tr/modules/Users.php index b53afd60..82d49fe0 100644 --- a/pkg/vtiger/translations/TurkishLanguagePack_tr_tr/modules/Users.php +++ b/pkg/vtiger/translations/TurkishLanguagePack_tr_tr/modules/Users.php @@ -199,8 +199,8 @@ $languageStrings = array( $jsLanguageStrings = array( - //Curency seperator validation messages - 'JS_DECIMAL_SEPERATOR_AND_GROUPING_SEPERATOR_CANT_BE_SAME' => 'Decimal seperator and Grouping seperator cant be same', + //Curency separator validation messages + 'JS_DECIMAL_SEPARATOR_AND_GROUPING_SEPARATOR_CANT_BE_SAME' => 'Decimal separator and Grouping separator cant be same', 'JS_ENTER_OLD_PASSWORD'=>'Please enter your old password.', 'JS_ENTER_NEW_PASSWORD'=>'Please enter your new password.', 'JS_ENTER_CONFIRMATION_PASSWORD'=>'Please enter your password confirmation.', diff --git a/vtlib/thirdparty/parser/feed/simplepie.inc b/vtlib/thirdparty/parser/feed/simplepie.inc index a7186fe0..5bfbb12a 100644 --- a/vtlib/thirdparty/parser/feed/simplepie.inc +++ b/vtlib/thirdparty/parser/feed/simplepie.inc @@ -11830,7 +11830,7 @@ class SimplePie_Parse_Date /** * Parse a superset of W3C-DTF (allows hyphens and colons to be omitted, as * well as allowing any of upper or lower case "T", horizontal tabs, or - * spaces to be used as the time seperator (including more than one)) + * spaces to be used as the time separator (including more than one)) * * @access protected * @return int Timestamp -- GitLab