diff options
author | mnaganov <mnaganov@chromium.org> | 2015-08-07 09:48:33 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-08-07 16:49:10 +0000 |
commit | 56917048940d4ecd4854416cee2901965320dc89 (patch) | |
tree | 89e6b97e05eae5e0e0b0b052dc39661c7359ab4b /android_webview/ui | |
parent | 488237f4eee9244e536acf8c71570df691f66b27 (diff) | |
download | chromium_src-56917048940d4ecd4854416cee2901965320dc89.zip chromium_src-56917048940d4ecd4854416cee2901965320dc89.tar.gz chromium_src-56917048940d4ecd4854416cee2901965320dc89.tar.bz2 |
[Android WebView] Prepare loading error messages for TC
While trying to hook up new strings from crrev.com/1270793002 into TC,
I have realized that some changes need to be made to their definitions.
1. In Chrome, html fragments (grit 'structures') are not used. Instead, they
just put into .grd files as regular messages, with markup being isolated
inside fake placeholders to avoid the translators messing with it.
(and grit also requires non-empty 'example' tags to present for them).
Thus, removed 'structure.html' and put its contents into a scary-looking
message.
2. .grd files containing messages must not include anything, as only .grd
files themselves are copied into the internal tree for processing.
Thus, split the messages into a separate .grd file with no includes.
3. From the strings .grd, per-locale .pak files must be produced, and then
all those xxx_strings_xx.pak files repacked into a single xx.pak file.
As WebView already uses content_strings, changed the script to pack
content_strings together with the new strings, and renamed the script
accordingly.
4. As I would not like to repeat this process again would we need some
native strings on the browser part, and as we share native resources
between the browser and the renderer, moved the .grd files out from
'renderer' into a new 'ui' subdir.
BUG=515691
Review URL: https://codereview.chromium.org/1273263002
Cr-Commit-Position: refs/heads/master@{#342367}
Diffstat (limited to 'android_webview/ui')
-rw-r--r-- | android_webview/ui/aw_resources.grd | 14 | ||||
-rw-r--r-- | android_webview/ui/aw_strings.grd | 78 | ||||
-rw-r--r-- | android_webview/ui/resources/load_error.html | 20 |
3 files changed, 112 insertions, 0 deletions
diff --git a/android_webview/ui/aw_resources.grd b/android_webview/ui/aw_resources.grd new file mode 100644 index 0000000..9bb0cb7 --- /dev/null +++ b/android_webview/ui/aw_resources.grd @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<grit current_release="1" latest_public_release="0"> + <outputs> + <output filename="grit/aw_resources.h" type="rc_header"> + <emit emit_type='prepend'></emit> + </output> + <output filename="aw_resources.pak" type="data_package" /> + </outputs> + <release seq="1"> + <includes> + <include name="IDR_AW_LOAD_ERROR_HTML" file="resources\load_error.html" flattenhtml="true" type="BINDATA" /> + </includes> + </release> +</grit> diff --git a/android_webview/ui/aw_strings.grd b/android_webview/ui/aw_strings.grd new file mode 100644 index 0000000..44d5135 --- /dev/null +++ b/android_webview/ui/aw_strings.grd @@ -0,0 +1,78 @@ +<?xml version="1.0" encoding="UTF-8"?> +<grit current_release="1" latest_public_release="0"> + <outputs> + <output filename="grit/aw_strings.h" type="rc_header"> + <emit emit_type='prepend'></emit> + </output> + <output filename="aw_strings_am.pak" type="data_package" lang="am" /> + <output filename="aw_strings_ar.pak" type="data_package" lang="ar" /> + <output filename="aw_strings_bg.pak" type="data_package" lang="bg" /> + <output filename="aw_strings_bn.pak" type="data_package" lang="bn" /> + <output filename="aw_strings_ca.pak" type="data_package" lang="ca" /> + <output filename="aw_strings_cs.pak" type="data_package" lang="cs" /> + <output filename="aw_strings_da.pak" type="data_package" lang="da" /> + <output filename="aw_strings_de.pak" type="data_package" lang="de" /> + <output filename="aw_strings_el.pak" type="data_package" lang="el" /> + <output filename="aw_strings_en-US.pak" type="data_package" lang="en" /> + <output filename="aw_strings_en-GB.pak" type="data_package" lang="en-GB" /> + <output filename="aw_strings_es.pak" type="data_package" lang="es" /> + <output filename="aw_strings_es-419.pak" type="data_package" lang="es-419" /> + <output filename="aw_strings_et.pak" type="data_package" lang="et" /> + <output filename="aw_strings_fa.pak" type="data_package" lang="fa" /> + <output filename="aw_strings_fi.pak" type="data_package" lang="fi" /> + <output filename="aw_strings_fil.pak" type="data_package" lang="fil" /> + <output filename="aw_strings_fr.pak" type="data_package" lang="fr" /> + <output filename="aw_strings_gu.pak" type="data_package" lang="gu" /> + <output filename="aw_strings_he.pak" type="data_package" lang="he" /> + <output filename="aw_strings_hi.pak" type="data_package" lang="hi" /> + <output filename="aw_strings_hr.pak" type="data_package" lang="hr" /> + <output filename="aw_strings_hu.pak" type="data_package" lang="hu" /> + <output filename="aw_strings_id.pak" type="data_package" lang="id" /> + <output filename="aw_strings_it.pak" type="data_package" lang="it" /> + <output filename="aw_strings_ja.pak" type="data_package" lang="ja" /> + <output filename="aw_strings_kn.pak" type="data_package" lang="kn" /> + <output filename="aw_strings_ko.pak" type="data_package" lang="ko" /> + <output filename="aw_strings_lt.pak" type="data_package" lang="lt" /> + <output filename="aw_strings_lv.pak" type="data_package" lang="lv" /> + <output filename="aw_strings_ml.pak" type="data_package" lang="ml" /> + <output filename="aw_strings_mr.pak" type="data_package" lang="mr" /> + <output filename="aw_strings_ms.pak" type="data_package" lang="ms" /> + <output filename="aw_strings_nl.pak" type="data_package" lang="nl" /> + <!-- The translation console uses 'no' for Norwegian Bokmål. It should + be 'nb'. --> + <output filename="aw_strings_nb.pak" type="data_package" lang="no" /> + <output filename="aw_strings_pl.pak" type="data_package" lang="pl" /> + <output filename="aw_strings_pt-BR.pak" type="data_package" lang="pt-BR" /> + <output filename="aw_strings_pt-PT.pak" type="data_package" lang="pt-PT" /> + <output filename="aw_strings_ro.pak" type="data_package" lang="ro" /> + <output filename="aw_strings_ru.pak" type="data_package" lang="ru" /> + <output filename="aw_strings_sk.pak" type="data_package" lang="sk" /> + <output filename="aw_strings_sl.pak" type="data_package" lang="sl" /> + <output filename="aw_strings_sr.pak" type="data_package" lang="sr" /> + <output filename="aw_strings_sv.pak" type="data_package" lang="sv" /> + <output filename="aw_strings_sw.pak" type="data_package" lang="sw" /> + <output filename="aw_strings_ta.pak" type="data_package" lang="ta" /> + <output filename="aw_strings_te.pak" type="data_package" lang="te" /> + <output filename="aw_strings_th.pak" type="data_package" lang="th" /> + <output filename="aw_strings_tr.pak" type="data_package" lang="tr" /> + <output filename="aw_strings_uk.pak" type="data_package" lang="uk" /> + <output filename="aw_strings_vi.pak" type="data_package" lang="vi" /> + <output filename="aw_strings_zh-CN.pak" type="data_package" lang="zh-CN" /> + <output filename="aw_strings_zh-TW.pak" type="data_package" lang="zh-TW" /> + </outputs> + <release seq="1"> + <messages fallback_to_english="true"> + <message name="IDS_AW_WEBPAGE_NOT_AVAILABLE" desc="The title of the webpage shown when the requested URL in unavailable"> + Webpage not available + </message> + <message name="IDS_AW_WEBPAGE_CAN_NOT_BE_LOADED" desc="Message informing the user that the page can not be loaded"> + The webpage at <ph name="PAGE"><strong>$1</strong><ex>page.html</ex></ph> could not be loaded because: + </message> + <message name="IDS_AW_WEBPAGE_TEMPORARILY_DOWN" desc="Message informing the user that it is not possible to contact the server"> + The webpage at <ph name="PAGE"><strong>$1</strong><ex>page.html</ex></ph> might be temporarily down or it may have moved permanently to a new web address. + </message> + <message name="IDS_AW_WEBPAGE_TEMPORARILY_DOWN_SUGGESTIONS" desc="Suggestions provided to the user when it is not possible to contact the server"><ph name="MARKUP_1"><strong><ex>_</ex></ph>Suggestions:<ph name="MARKUP_2"></strong><ul><li><ex>_</ex></ph>Make sure you have a data connection<ph name="MARKUP_3"></li><li><ex>_</ex></ph>Reload this webpage later<ph name="MARKUP_4"></li><li><ex>_</ex></ph>Check the address you entered<ph name="MARKUP_5"></li></ul><ex>_</ex></ph> + </message> + </messages> + </release> +</grit> diff --git a/android_webview/ui/resources/load_error.html b/android_webview/ui/resources/load_error.html new file mode 100644 index 0000000..fc64efd --- /dev/null +++ b/android_webview/ui/resources/load_error.html @@ -0,0 +1,20 @@ +<html> + <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no"/> + <title>$1</title> + <style type="text/css"> + body { margin-top: 0px; padding-top: 0px; $4 } /* Used for additional styles, e.g. direction */ + h2 { margin-top: 5px; padding-top: 0px; } + </style> + + <body> + <!-- Upside down Android --> + <img width="50" height="26" align="top" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAAaCAMAAADCHv/YAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAitQTFRFn8ctpMo4o8o3ocgzo8k3osk1oMcvo8k2osk0pco6+fzy7vXa9/rs8/jl/P75/v78/v/9osk2ocgy+Pvwo8o4/v79pss68ffho8k1/f77s9JY2umtqMxB/f76stJWvdhtrM5J6vPRpss7oskzpMo3nscs9fnoq85I7/bcp8w+0eOY2+qvstJV+vz08Pbd5e/E5O/En8crnsYrrtBNoMcutNNardBMpss80eSaoMgu5e/Focg08fffz+SYpcs6x96EsNFR5fDFxd2AuNVju9do9PjlzOGOoccvyuCL0OSYpco5ocky7/Xbwtt4zuKT8vfhr9BO8vjjpss+qc5F1eah4O273+y5qs1E0OOWt9Vks9NYqs1Crc9KxNx8oMgx3OqxocgwttRewdt36vPSu9dqqcxB9PnoncYos9JXv9lxqs1FqMxAuNZjsNFTn8cvosgz2eiq5vDI5/DJ/P35ttVg2Omp7vXZ7fTXnscrnsYqstJYuNRg+fvytNRc6PHL///94O26tdNb9Pjnn8csz+OWqs5Fosgx6PLNq85F1eajrM5I///+rc9Lt9Vgt9Rf/P344e29nMUo3uy1ttRgrs9MpMo6wdt2+vzzy+GN+Pvu+/32ockzqs1D3Ouy4e69rM9J8/jk8ffgzeKRq81Fqc1E1OWfxdx+nsct2+mw2emr9vrsxNx9yd+I0uafoMgw5O/CsdJW7PTT6/PS3Oqyn8cuocgxqs5HpMo5////jSIuSwAAAd9JREFUeNqE0vdb00AYB/BLmrShLaWLvTfIHrIEAREBwQkq0w0OkL1kCAoqICpbFPdEUUGakPfP44IWoU0v31/ufZ57P7m8uaAv1BZO5q8H0ZVbhAQUJdQESEVYJzqARByU5+5Gi4Sobr4YUEnF5aR/5Nu4EvHTbuyQkmTUc1cqUtuLFUhQYMtvvNIRMUifgRiGf6hPVEfyhMxOw9t0FWO6cQIQ6Aa9vO7/AYvtko2Q1RkjxIW4xX5NwAQCP+QaAF5d2yQltM8TQBvT9AQk8je6NrVASOrpLnvnLolq1JDGF56BE3lesEIi/E9nAkd4ElGfkyE5AoW3FsMjzfta0c77siF6GeLx9CLe4674X+d2ASWWVt2WTP9HkCEwmo6PEdbB+yxjJ+ZhI5zEfxT3+owsgYYUTLLAprHaCRudaAgWRGt2HMgTbTcvUhF3jjP/R/H5nBYuUugYuCAQFYRE6pB17/gmTqRT1owuCfwIHmMdP2/5o2pPcE3Ad/ICuxdRHB2ftL/FkQB01NWrW1UmhqY1rBn5TMUPgRJZKvOdu1o7EXs4rPndfP49w1F/JZK8YJGu9eUpXYW7dgSXhWkWMvHw++740FvLZPLmoKOA3k/eRPI41InA+fcK4ytnW4ABANzcGZFdd/x+AAAAAElFTkSuQmCC" /> + <h2>$1</h2> + <!-- Page url --> + <p>$2</p> + <!-- Error description or suggestions --> + <p>$3</p> + </body> + </head> +</html> |