am 8c657dc2: am b87e3000: Support langs.

* commit '8c657dc214ef430d57c6e0483e25eb6faf7a5619':
  Support langs.
This commit is contained in:
Dirk Dougherty 2014-11-21 10:37:02 +00:00 committed by Android Git Automerger
commit a38ca02145
6 changed files with 74 additions and 10 deletions

View File

@ -3152,6 +3152,7 @@ div#deprecatedSticker {
-webkit-box-shadow:-5px 5px 10px #ccc;
}
div#langMessage,
div#naMessage {
display:none;
width:555px;
@ -3159,6 +3160,8 @@ div#naMessage {
margin:0 auto;
}
div#langMessage>div,
div#naMessage div {
z-index:99;
width:450px;
@ -3172,12 +3175,16 @@ div#naMessage div {
-webkit-box-shadow:-10px 10px 40px #888;
}
/* IE6 can't position fixed */
* html div#langMessage>div,
* html div#naMessage div { position:absolute; }
div#naMessage strong {
font-size:1.1em;
}
div#langMessage .lang {
display:none;
}
/* --------------------------------------------------------------------------
Slideshow Controls & Next/Prev

View File

@ -21,6 +21,17 @@ $.ajaxSetup({
$(document).ready(function() {
// show lang dialog if the URL includes /intl/
//if (location.pathname.substring(0,6) == "/intl/") {
// var lang = location.pathname.split('/')[2];
// if (lang != getLangPref()) {
// $("#langMessage a.yes").attr("onclick","changeLangPref('" + lang
// + "', true); $('#langMessage').hide(); return false;");
// $("#langMessage .lang." + lang).show();
// $("#langMessage").show();
// }
//}
// load json file for JD doc search suggestions
$.getScript(toRoot + 'jd_lists_unified.js');
// load json file for Android API search suggestions

View File

@ -3,6 +3,52 @@
<?cs call:preview_masthead() ?>
<?cs else ?>
<a name="top"></a>
<!-- dialog to prompt lang pref change when loaded from hardcoded URL
<div id="langMessage" style="display:none">
<div>
<div class="lang en">
<p>You requested a page in English, would you like to proceed with this language setting?</p>
</div>
<div class="lang es">
<p>You requested a page in Spanish (Español), would you like to proceed with this language setting?</p>
</div>
<div class="lang ja">
<p>You requested a page in Japanese (), would you like to proceed with this language setting?</p>
</div>
<div class="lang ko">
<p>You requested a page in Korean (), would you like to proceed with this language setting?</p>
</div>
<div class="lang ru">
<p>You requested a page in Russian (Русский), would you like to proceed with this language setting?</p>
</div>
<div class="lang zh-cn">
<p>You requested a page in Simplified Chinese (), would you like to proceed with this language setting?</p>
</div>
<div class="lang zh-tw">
<p>You requested a page in Traditional Chinese (), would you like to proceed with this language setting?</p>
</div>
<a href="#" class="button yes" onclick="return false;">
<span class="lang en">Yes</span>
<span class="lang es"></span>
<span class="lang ja">Yes</span>
<span class="lang ko">Yes</span>
<span class="lang ru">Yes</span>
<span class="lang zh-cn"></span>
<span class="lang zh-tw"></span>
</a>
<a href="#" class="button" onclick="$('#langMessage').hide();return false;">
<span class="lang en">No</span>
<span class="lang es">No</span>
<span class="lang ja">No</span>
<span class="lang ko">No</span>
<span class="lang ru">No</span>
<span class="lang zh-cn"></span>
<span class="lang zh-tw"></span>
</a>
</div>
</div> -->
<?cs if:!devsite ?><?cs # leave out the global header for devsite; it is in devsite template ?>
<!-- Header -->
<div id="header-wrapper">

View File

@ -449,8 +449,8 @@ def:header_search_widget() ?>
<option value="ja"></option>
<option value="ko"></option>
<option value="ru">Русский</option>
<option value="zh-cn"> ()</option>
<option value="zh-tw"> ()</option>
<option value="zh-cn">)</option>
<option value="zh-tw">)</option>
</select>
</div>
<script type="text/javascript">

View File

@ -194,9 +194,9 @@ include:"header.cs" ?>
<?cs include:"trailer.cs" ?>
<script src="https://developer.android.com/ytblogger_lists_unified.js" type="text/javascript"></script>
<script src="<?cs var:toroot ?>jd_lists_unified.js?v=6" type="text/javascript"></script>
<script src="<?cs var:toroot ?>jd_extras.js?v=7" type="text/javascript"></script>
<script src="<?cs var:toroot ?>jd_collections.js?v=7" type="text/javascript"></script>
<script src="<?cs var:toroot ?>jd_lists_unified.js?v=7" type="text/javascript"></script>
<script src="<?cs var:toroot ?>jd_extras.js?v=8" type="text/javascript"></script>
<script src="<?cs var:toroot ?>jd_collections.js?v=8" type="text/javascript"></script>
<script src="<?cs var:toroot ?>jd_tag_helpers.js?v=5" type="text/javascript"></script>
</body>

View File

@ -38,7 +38,7 @@ if:android.whichdoc != 'online' ?>http:<?cs
if:android.whichdoc != 'online' ?>http:<?cs
/if ?>//fonts.googleapis.com/css?family=Roboto:light,regular,medium,thin,italic,mediumitalic,bold"
title="roboto">
<link href="<?cs var:toroot ?>assets/css/default.css?v=2" rel="stylesheet" type="text/css">
<link href="<?cs var:toroot ?>assets/css/default.css?v=3" rel="stylesheet" type="text/css">
<?cs if:reference && !(reference.gms || reference.gcm || preview) ?>
<!-- FULLSCREEN STYLESHEET -->
@ -62,7 +62,7 @@ else
var metaTags = [<?cs var:meta.tags ?>];
var devsite = <?cs if:devsite ?>true<?cs else ?>false<?cs /if ?>;
</script>
<script src="<?cs var:toroot ?>assets/js/docs.js?v=2" type="text/javascript"></script>
<script src="<?cs var:toroot ?>assets/js/docs.js?v=3" type="text/javascript"></script>
<?cs if:helpoutsWidget ?>
<script type="text/javascript" src="https://helpouts.google.com/ps/res/embed.js" defer async