Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a38ca021 authored by Dirk Dougherty's avatar Dirk Dougherty Committed by Android Git Automerger
Browse files

am 8c657dc2: am b87e3000: Support langs. 

* commit '8c657dc2':
  Support langs.
parents 51840e4b 8c657dc2

tools/droiddoc/templates-sdk/assets/css/default.css

+8 −1
Original line number Diff line number Diff line
@@ -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

tools/droiddoc/templates-sdk/assets/js/docs.js

+12 −1
Original line number Diff line number Diff line
@@ -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

tools/droiddoc/templates-sdk/components/masthead.cs

+47 −1
Original line number Diff line number Diff line
@@ -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">Sí</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">

tools/droiddoc/templates-sdk/customizations.cs

+2 −2
Original line number Diff line number Diff line
@@ -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">

tools/droiddoc/templates-sdk/docpage.cs

+3 −3
Original line number Diff line number Diff line
@@ -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>