From 88b5124c32df2b73d3f960dc4f004c2cbfbf04a9 Mon Sep 17 00:00:00 2001
From: Chris Hallberg <crhallberg@gmail.com>
Date: Fri, 13 Nov 2015 15:56:18 -0500
Subject: [PATCH] Phone number validation strings moved to layout.
---
themes/bootstrap3/js/common.js | 8 +-------
themes/bootstrap3/templates/layout/layout.phtml | 13 +++++++++++++
2 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/themes/bootstrap3/js/common.js b/themes/bootstrap3/js/common.js
index b741955cda3..da7f146cfce 100644
--- a/themes/bootstrap3/js/common.js
+++ b/themes/bootstrap3/js/common.js
@@ -85,19 +85,13 @@ function lessFacets(id) {
}
// Phone number validation
-var libphoneTranslateCodes = ["libphonenumber_invalid", "libphonenumber_invalidcountry", "libphonenumber_invalidregion", "libphonenumber_notanumber", "libphonenumber_toolong", "libphonenumber_tooshort", "libphonenumber_tooshortidd"];
-var libphoneErrorStrings = ["Phone number invalid", "Invalid country calling code", "Invalid region code", "The string supplied did not seem to be a phone number", "The string supplied is too long to be a phone number", "The string supplied is too short to be a phone number", "Phone number too short after IDD"];
function phoneNumberFormHandler(numID, regionCode) {
var phoneInput = document.getElementById(numID);
var number = phoneInput.value;
var valid = isPhoneNumberValid(number, regionCode);
if(valid != true) {
if(typeof valid === 'string') {
- for(var i=libphoneErrorStrings.length;i--;) {
- if(valid.match(libphoneErrorStrings[i])) {
- valid = vufindString[libphoneTranslateCodes[i]];
- }
- }
+ valid = vufindString[valid];
} else {
valid = vufindString['libphonenumber_invalid'];
}
diff --git a/themes/bootstrap3/templates/layout/layout.phtml b/themes/bootstrap3/templates/layout/layout.phtml
index e9cb2e0784f..03f2d14dfdc 100644
--- a/themes/bootstrap3/templates/layout/layout.phtml
+++ b/themes/bootstrap3/templates/layout/layout.phtml
@@ -30,6 +30,7 @@
// Deal with cart stuff:
if (!isset($this->renderingError)) {
+ // Add translation strings
$this->jsTranslations()->addStrings(
array(
'add_tag_success' => 'add_tag_success',
@@ -49,6 +50,18 @@
'number_thousands_separator' => ['number_thousands_separator', null, ',']
)
);
+ // Add libphonenumber.js strings
+ $this->jsTranslations()->addStrings(
+ array(
+ "'Phone number invalid'" => 'libphonenumber_invalid',
+ "'Invalid country calling code'" => 'libphonenumber_invalidcountry',
+ "'Invalid region code'" => 'libphonenumber_invalidregion',
+ "'The string supplied did not seem to be a phone number'" => 'libphonenumber_notanumber',
+ "'The string supplied is too long to be a phone number'" => 'libphonenumber_toolong',
+ "'The string supplied is too short to be a phone number'" => 'libphonenumber_tooshort',
+ "'Phone number too short after IDD'" => 'libphonenumber_tooshortidd'
+ )
+ );
$cart = $this->cart();
if ($cart->isActive()) {
$this->headScript()->appendFile("vendor/cookies.js");
--
GitLab