Commit 69d1b3b8 authored by rouslan@chromium.org's avatar rouslan@chromium.org

Include upstream libaddressinput strings in Chrome build.

This patch adds the upstream libaddressinput strings into the Chrome
build inside of chrome/app/address_input.grd[p] to work well with the
translation tools.

This patch should precede using upstream libaddressinput to ensure that
the upstream libaddressinput has the correct strings well ahead of using
it in Chrome.

Although the strings include postal code examples and links for error
messages, these features are optional and can be turned off if
undesired.

BUG=327046

Review URL: https://codereview.chromium.org/304223010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@276559 0039d316-1c4b-4281-b951-d872f2087c98
parent e4be6e2d
......@@ -39,7 +39,7 @@ vars = {
# to update other nacl_*_revision's.
"nacl_tools_revision": "13077", # native_client/DEPS: tools_rev
"google_toolbox_for_mac_revision": "662",
"libaddressinput_revision": "265",
"libaddressinput_revision": "273",
"libphonenumber_revision": "621",
"libvpx_revision": "269083",
"lss_revision": "26",
......
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright 2014 The Chromium Authors. All rights reserved.
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file.
This file is a copy of third_party/libaddressinput/src/cpp/res/messages.grd,
seasoned with information about translations from Chromium.
The location of messages.h and en_messages.cc is defined in
third_party/libaddressinput/libaddressinput.gyp.
-->
<grit base_dir="." latest_public_release="0" current_release="1"
source_lang_id="en" enc_check="möl">
<outputs>
<output filename="messages.h" type="rc_header" lang="en">
<emit>
<!-- If the emit element is not specified, then the generated
messages.h includes an atlres.h file from Windows Template
Library (WTL). -->
</emit>
</output>
<output filename="en_messages.cc" lang="en" type="c_format" />
<!-- Chromium language packs. -->
<output filename="address_input_strings_am.pak" type="data_package" lang="am" />
<output filename="address_input_strings_ar.pak" type="data_package" lang="ar" />
<if expr="use_third_party_translations">
<output filename="address_input_strings_ast.pak" type="data_package" lang="ast" />
</if>
<output filename="address_input_strings_bg.pak" type="data_package" lang="bg" />
<output filename="address_input_strings_bn.pak" type="data_package" lang="bn" />
<if expr="use_third_party_translations">
<output filename="address_input_strings_bs.pak" type="data_package" lang="bs" />
</if>
<output filename="address_input_strings_ca.pak" type="data_package" lang="ca" />
<if expr="use_third_party_translations">
<output filename="address_input_strings_ca@valencia.pak" type="data_package" lang="ca@valencia" />
</if>
<output filename="address_input_strings_cs.pak" type="data_package" lang="cs" />
<output filename="address_input_strings_da.pak" type="data_package" lang="da" />
<output filename="address_input_strings_de.pak" type="data_package" lang="de" />
<output filename="address_input_strings_el.pak" type="data_package" lang="el" />
<if expr="use_third_party_translations">
<output filename="address_input_strings_en-AU.pak" type="data_package" lang="en-AU" />
</if>
<output filename="address_input_strings_en-GB.pak" type="data_package" lang="en-GB" />
<output filename="address_input_strings_en-US.pak" type="data_package" lang="en" />
<if expr="use_third_party_translations">
<output filename="address_input_strings_eo.pak" type="data_package" lang="eo" />
</if>
<output filename="address_input_strings_es.pak" type="data_package" lang="es" />
<if expr="is_ios">
<!-- iOS uses es-MX for es-419 -->
<output filename="address_input_strings_es-MX.pak" type="data_package" lang="es-419" />
</if>
<if expr="not is_ios">
<output filename="address_input_strings_es-419.pak" type="data_package" lang="es-419" />
</if>
<output filename="address_input_strings_et.pak" type="data_package" lang="et" />
<if expr="use_third_party_translations">
<output filename="address_input_strings_eu.pak" type="data_package" lang="eu" />
</if>
<output filename="address_input_strings_fa.pak" type="data_package" lang="fa" />
<output filename="address_input_strings_fake-bidi.pak" type="data_package" lang="fake-bidi" />
<output filename="address_input_strings_fi.pak" type="data_package" lang="fi" />
<output filename="address_input_strings_fil.pak" type="data_package" lang="fil" />
<output filename="address_input_strings_fr.pak" type="data_package" lang="fr" />
<if expr="use_third_party_translations">
<output filename="address_input_strings_gl.pak" type="data_package" lang="gl" />
</if>
<output filename="address_input_strings_gu.pak" type="data_package" lang="gu" />
<output filename="address_input_strings_he.pak" type="data_package" lang="he" />
<output filename="address_input_strings_hi.pak" type="data_package" lang="hi" />
<output filename="address_input_strings_hr.pak" type="data_package" lang="hr" />
<output filename="address_input_strings_hu.pak" type="data_package" lang="hu" />
<if expr="use_third_party_translations">
<output filename="address_input_strings_hy.pak" type="data_package" lang="hy" />
<output filename="address_input_strings_ia.pak" type="data_package" lang="ia" />
</if>
<output filename="address_input_strings_id.pak" type="data_package" lang="id" />
<output filename="address_input_strings_it.pak" type="data_package" lang="it" />
<output filename="address_input_strings_ja.pak" type="data_package" lang="ja" />
<if expr="use_third_party_translations">
<output filename="address_input_strings_ka.pak" type="data_package" lang="ka" />
</if>
<output filename="address_input_strings_kn.pak" type="data_package" lang="kn" />
<output filename="address_input_strings_ko.pak" type="data_package" lang="ko" />
<if expr="use_third_party_translations">
<output filename="address_input_strings_ku.pak" type="data_package" lang="ku" />
<output filename="address_input_strings_kw.pak" type="data_package" lang="kw" />
</if>
<output filename="address_input_strings_lt.pak" type="data_package" lang="lt" />
<output filename="address_input_strings_lv.pak" type="data_package" lang="lv" />
<output filename="address_input_strings_ml.pak" type="data_package" lang="ml" />
<output filename="address_input_strings_mr.pak" type="data_package" lang="mr" />
<output filename="address_input_strings_ms.pak" type="data_package" lang="ms" />
<output filename="address_input_strings_nl.pak" type="data_package" lang="nl" />
<!-- The translation console uses 'no' for Norwegian Bokmål. It should
be 'nb'. -->
<output filename="address_input_strings_nb.pak" type="data_package" lang="no" />
<output filename="address_input_strings_pl.pak" type="data_package" lang="pl" />
<if expr="is_ios">
<!-- iOS uses pt for pt-BR -->
<output filename="address_input_strings_pt.pak" type="data_package" lang="pt-BR" />
</if>
<if expr="not is_ios">
<output filename="address_input_strings_pt-BR.pak" type="data_package" lang="pt-BR" />
</if>
<output filename="address_input_strings_pt-PT.pak" type="data_package" lang="pt-PT" />
<output filename="address_input_strings_ro.pak" type="data_package" lang="ro" />
<output filename="address_input_strings_ru.pak" type="data_package" lang="ru" />
<output filename="address_input_strings_sk.pak" type="data_package" lang="sk" />
<output filename="address_input_strings_sl.pak" type="data_package" lang="sl" />
<output filename="address_input_strings_sr.pak" type="data_package" lang="sr" />
<output filename="address_input_strings_sv.pak" type="data_package" lang="sv" />
<output filename="address_input_strings_sw.pak" type="data_package" lang="sw" />
<output filename="address_input_strings_ta.pak" type="data_package" lang="ta" />
<output filename="address_input_strings_te.pak" type="data_package" lang="te" />
<output filename="address_input_strings_th.pak" type="data_package" lang="th" />
<output filename="address_input_strings_tr.pak" type="data_package" lang="tr" />
<if expr="use_third_party_translations">
<output filename="address_input_strings_ug.pak" type="data_package" lang="ug" />
</if>
<output filename="address_input_strings_uk.pak" type="data_package" lang="uk" />
<output filename="address_input_strings_vi.pak" type="data_package" lang="vi" />
<output filename="address_input_strings_zh-CN.pak" type="data_package" lang="zh-CN" />
<output filename="address_input_strings_zh-TW.pak" type="data_package" lang="zh-TW" />
</outputs>
<!-- Chromium translations. -->
<translations>
<file path="resources/address_input_strings_am.xtb" lang="am" />
<file path="resources/address_input_strings_ar.xtb" lang="ar" />
<file path="resources/address_input_strings_bg.xtb" lang="bg" />
<file path="resources/address_input_strings_bn.xtb" lang="bn" />
<file path="resources/address_input_strings_ca.xtb" lang="ca" />
<file path="resources/address_input_strings_cs.xtb" lang="cs" />
<file path="resources/address_input_strings_da.xtb" lang="da" />
<file path="resources/address_input_strings_de.xtb" lang="de" />
<file path="resources/address_input_strings_el.xtb" lang="el" />
<file path="resources/address_input_strings_en-GB.xtb" lang="en-GB" />
<file path="resources/address_input_strings_es.xtb" lang="es" />
<file path="resources/address_input_strings_es-419.xtb" lang="es-419" />
<file path="resources/address_input_strings_et.xtb" lang="et" />
<file path="resources/address_input_strings_fa.xtb" lang="fa" />
<file path="resources/address_input_strings_fi.xtb" lang="fi" />
<file path="resources/address_input_strings_fil.xtb" lang="fil" />
<file path="resources/address_input_strings_fr.xtb" lang="fr" />
<file path="resources/address_input_strings_gu.xtb" lang="gu" />
<file path="resources/address_input_strings_hi.xtb" lang="hi" />
<file path="resources/address_input_strings_hr.xtb" lang="hr" />
<file path="resources/address_input_strings_hu.xtb" lang="hu" />
<file path="resources/address_input_strings_id.xtb" lang="id" />
<file path="resources/address_input_strings_it.xtb" lang="it" />
<!-- The translation console uses 'iw' for Hebrew, but we use 'he'. -->
<file path="resources/address_input_strings_iw.xtb" lang="he" />
<file path="resources/address_input_strings_ja.xtb" lang="ja" />
<file path="resources/address_input_strings_kn.xtb" lang="kn" />
<file path="resources/address_input_strings_ko.xtb" lang="ko" />
<file path="resources/address_input_strings_lt.xtb" lang="lt" />
<file path="resources/address_input_strings_lv.xtb" lang="lv" />
<file path="resources/address_input_strings_ml.xtb" lang="ml" />
<file path="resources/address_input_strings_mr.xtb" lang="mr" />
<file path="resources/address_input_strings_ms.xtb" lang="ms" />
<file path="resources/address_input_strings_nl.xtb" lang="nl" />
<file path="resources/address_input_strings_no.xtb" lang="no" />
<file path="resources/address_input_strings_pl.xtb" lang="pl" />
<file path="resources/address_input_strings_pt-BR.xtb" lang="pt-BR" />
<file path="resources/address_input_strings_pt-PT.xtb" lang="pt-PT" />
<file path="resources/address_input_strings_ro.xtb" lang="ro" />
<file path="resources/address_input_strings_ru.xtb" lang="ru" />
<file path="resources/address_input_strings_sk.xtb" lang="sk" />
<file path="resources/address_input_strings_sl.xtb" lang="sl" />
<file path="resources/address_input_strings_sr.xtb" lang="sr" />
<file path="resources/address_input_strings_sv.xtb" lang="sv" />
<file path="resources/address_input_strings_sw.xtb" lang="sw" />
<file path="resources/address_input_strings_ta.xtb" lang="ta" />
<file path="resources/address_input_strings_te.xtb" lang="te" />
<file path="resources/address_input_strings_th.xtb" lang="th" />
<file path="resources/address_input_strings_tr.xtb" lang="tr" />
<file path="resources/address_input_strings_uk.xtb" lang="uk" />
<file path="resources/address_input_strings_vi.xtb" lang="vi" />
<file path="resources/address_input_strings_zh-CN.xtb" lang="zh-CN" />
<file path="resources/address_input_strings_zh-TW.xtb" lang="zh-TW" />
</translations>
<release seq="1" allow_pseudo="false">
<messages fallback_to_english="true">
<!-- Chromium name for the file with original strings to work well with
translation tools. -->
<part file="address_input_strings.grdp" />
</messages>
</release>
</grit>
<?xml version="1.0" ?>
<!DOCTYPE translationbundle>
<translationbundle lang="am">
</translationbundle>
<?xml version="1.0" ?>
<!DOCTYPE translationbundle>
<translationbundle lang="ar">
</translationbundle>
<?xml version="1.0" ?>
<!DOCTYPE translationbundle>
<translationbundle lang="bg">
</translationbundle>
<?xml version="1.0" ?>
<!DOCTYPE translationbundle>
<translationbundle lang="bn">
</translationbundle>
<?xml version="1.0" ?>
<!DOCTYPE translationbundle>
<translationbundle lang="ca">
</translationbundle>
<?xml version="1.0" ?>
<!DOCTYPE translationbundle>
<translationbundle lang="cs">
</translationbundle>
<?xml version="1.0" ?>
<!DOCTYPE translationbundle>
<translationbundle lang="da">
</translationbundle>
<?xml version="1.0" ?>
<!DOCTYPE translationbundle>
<translationbundle lang="de">
</translationbundle>
<?xml version="1.0" ?>
<!DOCTYPE translationbundle>
<translationbundle lang="el">
</translationbundle>
<?xml version="1.0" ?>
<!DOCTYPE translationbundle>
<translationbundle lang="en-GB">
</translationbundle>
<?xml version="1.0" ?>
<!DOCTYPE translationbundle>
<translationbundle lang="es-419">
</translationbundle>
<?xml version="1.0" ?>
<!DOCTYPE translationbundle>
<translationbundle lang="es">
</translationbundle>
<?xml version="1.0" ?>
<!DOCTYPE translationbundle>
<translationbundle lang="et">
</translationbundle>
<?xml version="1.0" ?>
<!DOCTYPE translationbundle>
<translationbundle lang="fa">
</translationbundle>
<?xml version="1.0" ?>
<!DOCTYPE translationbundle>
<translationbundle lang="fi">
</translationbundle>
<?xml version="1.0" ?>
<!DOCTYPE translationbundle>
<translationbundle lang="fil">
</translationbundle>
<?xml version="1.0" ?>
<!DOCTYPE translationbundle>
<translationbundle lang="fr">
</translationbundle>
<?xml version="1.0" ?>
<!DOCTYPE translationbundle>
<translationbundle lang="gu">
</translationbundle>
<?xml version="1.0" ?>
<!DOCTYPE translationbundle>
<translationbundle lang="hi">
</translationbundle>
<?xml version="1.0" ?>
<!DOCTYPE translationbundle>
<translationbundle lang="hr">
</translationbundle>
<?xml version="1.0" ?>
<!DOCTYPE translationbundle>
<translationbundle lang="hu">
</translationbundle>
<?xml version="1.0" ?>
<!DOCTYPE translationbundle>
<translationbundle lang="id">
</translationbundle>
<?xml version="1.0" ?>
<!DOCTYPE translationbundle>
<translationbundle lang="it">
</translationbundle>
<?xml version="1.0" ?>
<!DOCTYPE translationbundle>
<translationbundle lang="iw">
</translationbundle>
<?xml version="1.0" ?>
<!DOCTYPE translationbundle>
<translationbundle lang="ja">
</translationbundle>
<?xml version="1.0" ?>
<!DOCTYPE translationbundle>
<translationbundle lang="kn">
</translationbundle>
<?xml version="1.0" ?>
<!DOCTYPE translationbundle>
<translationbundle lang="ko">
</translationbundle>
<?xml version="1.0" ?>
<!DOCTYPE translationbundle>
<translationbundle lang="lt">
</translationbundle>
<?xml version="1.0" ?>
<!DOCTYPE translationbundle>
<translationbundle lang="lv">
</translationbundle>
<?xml version="1.0" ?>
<!DOCTYPE translationbundle>
<translationbundle lang="ml">
</translationbundle>
<?xml version="1.0" ?>
<!DOCTYPE translationbundle>
<translationbundle lang="mr">
</translationbundle>
<?xml version="1.0" ?>
<!DOCTYPE translationbundle>
<translationbundle lang="ms">
</translationbundle>
<?xml version="1.0" ?>
<!DOCTYPE translationbundle>
<translationbundle lang="nl">
</translationbundle>
<?xml version="1.0" ?>
<!DOCTYPE translationbundle>
<translationbundle lang="no">
</translationbundle>
<?xml version="1.0" ?>
<!DOCTYPE translationbundle>
<translationbundle lang="pl">
</translationbundle>
<?xml version="1.0" ?>
<!DOCTYPE translationbundle>
<translationbundle lang="pt-BR">
</translationbundle>
<?xml version="1.0" ?>
<!DOCTYPE translationbundle>
<translationbundle lang="pt-PT">
</translationbundle>
<?xml version="1.0" ?>
<!DOCTYPE translationbundle>
<translationbundle lang="ro">
</translationbundle>
<?xml version="1.0" ?>
<!DOCTYPE translationbundle>
<translationbundle lang="ru">
</translationbundle>
<?xml version="1.0" ?>
<!DOCTYPE translationbundle>
<translationbundle lang="sk">
</translationbundle>
<?xml version="1.0" ?>
<!DOCTYPE translationbundle>
<translationbundle lang="sl">
</translationbundle>
<?xml version="1.0" ?>
<!DOCTYPE translationbundle>
<translationbundle lang="sr">
</translationbundle>
<?xml version="1.0" ?>
<!DOCTYPE translationbundle>
<translationbundle lang="sv">
</translationbundle>
<?xml version="1.0" ?>
<!DOCTYPE translationbundle>
<translationbundle lang="sw">
</translationbundle>
<?xml version="1.0" ?>
<!DOCTYPE translationbundle>
<translationbundle lang="ta">
</translationbundle>
<?xml version="1.0" ?>
<!DOCTYPE translationbundle>
<translationbundle lang="te">
</translationbundle>
<?xml version="1.0" ?>
<!DOCTYPE translationbundle>
<translationbundle lang="th">
</translationbundle>
<?xml version="1.0" ?>
<!DOCTYPE translationbundle>
<translationbundle lang="tr">
</translationbundle>
<?xml version="1.0" ?>
<!DOCTYPE translationbundle>
<translationbundle lang="uk">
</translationbundle>
<?xml version="1.0" ?>
<!DOCTYPE translationbundle>
<translationbundle lang="vi">
</translationbundle>
<?xml version="1.0" ?>
<!DOCTYPE translationbundle>
<translationbundle lang="zh-CN">
</translationbundle>
<?xml version="1.0" ?>
<!DOCTYPE translationbundle>
<translationbundle lang="zh-TW">
</translationbundle>
......@@ -115,6 +115,11 @@ def calc_inputs(locale):
inputs.append(os.path.join(SHARE_INT_DIR, 'third_party', 'libaddressinput',
'libaddressinput_strings_%s.pak' % locale))
#e.g. '<(SHARED_INTERMEDIATE_DIR)/grit/libaddressinput/
# address_input_strings_da.pak',
inputs.append(os.path.join(SHARE_INT_DIR, 'grit', 'libaddressinput',
'address_input_strings_%s.pak' % locale))
#e.g. '<(grit_out_dir)/google_chrome_strings_da.pak'
# or
# '<(grit_out_dir)/chromium_strings_da.pak'
......
......@@ -2,8 +2,8 @@ Name: The library to input, validate, and display addresses.
Short Name: libaddressinput
URL: https://code.google.com/p/libaddressinput/
Version: 0
Date: 4 June 2014
Revision: 265
Date: 10 June 2014
Revision: 273
License: Apache 2.0
License File: LICENSE
Security Critical: no
......
......@@ -24,14 +24,6 @@ to the upstream library at https://libaddressinput.googlecode.com/.
script_dir = os.path.dirname(os.path.realpath(__file__))
from_file = os.path.abspath(os.path.join(
script_dir, os.pardir, os.pardir, 'src', 'cpp', 'res', 'messages.grdp'))
if not os.path.isfile(from_file):
# Android and iOS do not use src/third_party/libaddressinput/src/. Gclient
# cannot filter out hooks based on OS or (when using git) based on file name
# patterns.
print('No libaddressinput for this target OS.')
sys.exit()
to_file = os.path.abspath(os.path.join(
script_dir, os.pardir, os.pardir, os.pardir, os.pardir, 'chrome', 'app',
'address_input_strings.grdp'))
......
......@@ -41,6 +41,27 @@
'../../build/grit_target.gypi',
],
},
{
'target_name': 'libaddressinput_updated_strings',
'type': 'none',
'variables': {
'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/grit/libaddressinput/',
},
'actions': [
{
'action_name': 'libaddressinput_updated_strings',
'variables': {
'grit_grd_file': '../../chrome/app/address_input_strings.grd',
},
'includes': [
'../../build/grit_action.gypi',
],
},
],
'includes': [
'../../build/grit_target.gypi',
],
},
# This target provides basic functionality which is cooked into the build.
{ 'target_name': 'libaddressinput_util',
'type': 'static_library',
......@@ -129,6 +150,7 @@
],
'dependencies': [
'libaddressinput_strings',
'libaddressinput_updated_strings',
'libaddressinput_util',
'<(DEPTH)/base/base.gyp:base',
'<(DEPTH)/base/base.gyp:base_i18n',
......
......@@ -201,6 +201,9 @@
"third_party/libaddressinput/chromium/cpp/res/libaddressinput_strings.grd": {
"messages": [29050],
},
"chrome/app/address_input_strings.grd": {
"messages": [29100],
},
"components/components_strings.grd": {
"messages": [30000],
},
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment