summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrouslan <rouslan@chromium.org>2015-01-07 15:50:31 -0800
committerCommit bot <commit-bot@chromium.org>2015-01-07 23:51:14 +0000
commit98b86ee0d0071bdfc5ec8c301a2fb257c05eb007 (patch)
tree3f6aa35a8d5f8d040e661ded7bf1efa62e31e019
parentdb6ccec0d42e1d79ba67085f04afde6db7b78284 (diff)
downloadchromium_src-98b86ee0d0071bdfc5ec8c301a2fb257c05eb007.zip
chromium_src-98b86ee0d0071bdfc5ec8c301a2fb257c05eb007.tar.gz
chromium_src-98b86ee0d0071bdfc5ec8c301a2fb257c05eb007.tar.bz2
Bump libaddressinput version.
The new version of libaddressinput fixes a crash and adds "PIN Code" as a type of postal code used in India. BUG=446546 Review URL: https://codereview.chromium.org/841763003 Cr-Commit-Position: refs/heads/master@{#310412}
-rw-r--r--DEPS2
-rw-r--r--build/ios/grit_whitelist.txt1
-rw-r--r--chrome/android/java/src/org/chromium/chrome/browser/preferences/autofill/ChromeAddressWidgetUiComponentProvider.java3
-rw-r--r--chrome/app/address_input_strings.grdp5
4 files changed, 10 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index 7487fcd..b5fdbb2 100644
--- a/DEPS
+++ b/DEPS
@@ -262,7 +262,7 @@ deps = {
Var('chromium_git') + '/external/smhasher.git' + '@' + 'e87738e57558e0ec472b2fc3a643b838e5b6e88f',
'src/third_party/libaddressinput/src':
- Var('chromium_git') + '/external/libaddressinput.git' + '@' + '678a7f55a2ae7ccf417b4809e602b808b56a8ddb',
+ Var('chromium_git') + '/external/libaddressinput.git' + '@' + '61f63da7ae6fa469138d60dec5d6bbecc6ab43d6',
# These are all at libphonenumber r728.
'src/third_party/libphonenumber/src/phonenumbers':
diff --git a/build/ios/grit_whitelist.txt b/build/ios/grit_whitelist.txt
index aa585d8..6c232c1 100644
--- a/build/ios/grit_whitelist.txt
+++ b/build/ios/grit_whitelist.txt
@@ -697,6 +697,7 @@ IDS_LIBADDRESSINPUT_NEIGHBORHOOD
IDS_LIBADDRESSINPUT_OBLAST
IDS_LIBADDRESSINPUT_ORGANIZATION_LABEL
IDS_LIBADDRESSINPUT_PARISH
+IDS_LIBADDRESSINPUT_PIN_CODE_LABEL
IDS_LIBADDRESSINPUT_POSTAL_CODE_LABEL
IDS_LIBADDRESSINPUT_POST_TOWN
IDS_LIBADDRESSINPUT_PO_BOX_FORBIDDEN_VALUE
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/autofill/ChromeAddressWidgetUiComponentProvider.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/autofill/ChromeAddressWidgetUiComponentProvider.java
index 0167e2b..f72a286 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/autofill/ChromeAddressWidgetUiComponentProvider.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/autofill/ChromeAddressWidgetUiComponentProvider.java
@@ -59,6 +59,9 @@ class ChromeAddressWidgetUiComponentProvider extends AddressWidgetUiComponentPro
context.getString(com.android.i18n.addressinput.R.string.i18n_address_line1_label),
com.android.i18n.addressinput.R.string.libaddressinput_address_line_1_label);
mI18nLabelMap.put(
+ context.getString(com.android.i18n.addressinput.R.string.i18n_pin_code_label),
+ com.android.i18n.addressinput.R.string.libaddressinput_pin_code_label);
+ mI18nLabelMap.put(
context.getString(com.android.i18n.addressinput.R.string.i18n_postal_code_label),
com.android.i18n.addressinput.R.string.libaddressinput_postal_code_label);
mI18nLabelMap.put(
diff --git a/chrome/app/address_input_strings.grdp b/chrome/app/address_input_strings.grdp
index 52f2b03..ff0b8db 100644
--- a/chrome/app/address_input_strings.grdp
+++ b/chrome/app/address_input_strings.grdp
@@ -63,6 +63,11 @@ limitations under the License.
Street address
</message>
<message
+ name="IDS_LIBADDRESSINPUT_PIN_CODE_LABEL"
+ desc="PIN (Postal Index Number) Code. Values are numeric. Used in India.">
+ PIN code
+ </message>
+ <message
name="IDS_LIBADDRESSINPUT_POSTAL_CODE_LABEL"
desc="Postal Code. Values are frequently alphanumeric. Used in countries
such as Switzerland.">