gnucash-htdocs master: Revert "Replace five-character locale code links with two-character"

John Ralls jralls at code.gnucash.org
Tue Jan 28 13:20:17 EST 2014


Updated	 via  https://github.com/Gnucash/gnucash-htdocs/commit/cec174af (commit)
	from  https://github.com/Gnucash/gnucash-htdocs/commit/c77284eb (commit)



commit cec174af20786abfc4c036595a97f99ae51bfb3f
Author: John Ralls <jralls at ceridwen.us>
Date:   Tue Jan 28 10:20:37 2014 -0800

    Revert "Replace five-character locale code links with two-character"
    
    This reverts commit c77284eb8c416c3eb71bea50c3bed094c38e15eb.
    Didn't work.

diff --git a/docs.phtml b/docs.phtml
index eee843d..b9194c0 100644
--- a/docs.phtml
+++ b/docs.phtml
@@ -55,24 +55,24 @@ include("externals/menu.phtml");
       </td></tr>
       <tr class="doctr">
       <td><?php echo T_("German");?> :</td><td>
-        <a href="<?=$top_dir;?>/viewdoc.phtml?rev=<?=$major_stable;?>&lang=de&doc=help">
+        <a href="<?=$top_dir;?>/viewdoc.phtml?rev=<?=$major_stable;?>&lang=de_DE&doc=help">
           <img class="docicon" alt="online" title="<?php echo T_($online);?>" src="<?=$top_dir;?>/images/icons/online_logo.png" /></a> |
-        <a href="<?=$top_dir;?>/docs/v<?=$major_stable;?>/de/gnucash-help.pdf">
+        <a href="<?=$top_dir;?>/docs/v<?=$major_stable;?>/de_DE/gnucash-help.pdf">
           <img class="docicon" alt="pdf" title="<?php echo T_($pdf);?>" src="<?=$top_dir;?>/images/icons/pdf_logo.png" /></a> |
-        <a href="<?=$top_dir;?>/docs/v<?=$major_stable;?>/de/gnucash-help.epubf">
+        <a href="<?=$top_dir;?>/docs/v<?=$major_stable;?>/de_DE/gnucash-help.epubf">
           <img class="docicon" alt="epub" title="<?php echo T_($epub);?>" src="<?=$top_dir;?>/images/icons/epub_logo.png" /></a> |
-        <a href="<?=$top_dir;?>/docs/v<?=$major_stable;?>/de/gnucash-help.mobi">
+        <a href="<?=$top_dir;?>/docs/v<?=$major_stable;?>/de_DE/gnucash-help.mobi">
           <img class="docicon" alt="mobi" title="<?php echo T_($mobi);?>" src="<?=$top_dir;?>/images/icons/mobipocket_logo.png" /></a>
       </td></tr>
       <tr class="doctr">
       <td><?php echo T_("Italian");?> :</td><td>
-        <a href="<?=$top_dir;?>/viewdoc.phtml?rev=<?=$major_stable;?>&lang=it&doc=help">
+        <a href="<?=$top_dir;?>/viewdoc.phtml?rev=<?=$major_stable;?>&lang=it_IT&doc=help">
           <img class="docicon" alt="online" title="<?php echo T_($online);?>" src="<?=$top_dir;?>/images/icons/online_logo.png" /></a> |
-        <a href="<?=$top_dir;?>/docs/v<?=$major_stable;?>/it/gnucash-help.pdf">
+        <a href="<?=$top_dir;?>/docs/v<?=$major_stable;?>/it_IT/gnucash-help.pdf">
           <img class="docicon" alt="pdf" title="<?php echo T_($pdf);?>" src="<?=$top_dir;?>/images/icons/pdf_logo.png" /></a> |
-        <a href="<?=$top_dir;?>/docs/v<?=$major_stable;?>/it/gnucash-help.epub">
+        <a href="<?=$top_dir;?>/docs/v<?=$major_stable;?>/it_IT/gnucash-help.epub">
           <img class="docicon" alt="epub" title="<?php echo T_($epub);?>" src="<?=$top_dir;?>/images/icons/epub_logo.png" /></a> |
-        <a href="<?=$top_dir;?>/docs/v<?=$major_stable;?>/it/gnucash-help.mobi">
+        <a href="<?=$top_dir;?>/docs/v<?=$major_stable;?>/it_IT/gnucash-help.mobi">
           <img class="docicon" alt="mobi" title="<?php echo T_($mobi);?>" src="<?=$top_dir;?>/images/icons/mobipocket_logo.png" /></a>
       </td></tr>
     </tbody>
@@ -94,35 +94,35 @@ include("externals/menu.phtml");
       </td></tr>
       <tr class="doctr">
       <td><?php echo T_("German");?> :</td><td>
-        <a href="<?=$top_dir;?>/viewdoc.phtml?rev=<?=$major_stable;?>&lang=de&doc=guide">
+        <a href="<?=$top_dir;?>/viewdoc.phtml?rev=<?=$major_stable;?>&lang=de_DE&doc=guide">
           <img class="docicon" alt="online" title="<?php echo T_($online);?>" src="<?=$top_dir;?>/images/icons/online_logo.png" /></a> |
-        <a href="<?=$top_dir;?>/docs/v<?=$major_stable;?>/de/gnucash-guide.pdf">
+        <a href="<?=$top_dir;?>/docs/v<?=$major_stable;?>/de_DE/gnucash-guide.pdf">
           <img class="docicon" alt="pdf" title="<?php echo T_($pdf);?>" src="<?=$top_dir;?>/images/icons/pdf_logo.png" /></a> |
-        <a href="<?=$top_dir;?>/docs/v<?=$major_stable;?>/de/gnucash-guide.epub">
+        <a href="<?=$top_dir;?>/docs/v<?=$major_stable;?>/de_DE/gnucash-guide.epub">
           <img class="docicon" alt="epub" title="<?php echo T_($epub);?>" src="<?=$top_dir;?>/images/icons/epub_logo.png" /></a> |
-        <a href="<?=$top_dir;?>/docs/v<?=$major_stable;?>/de/gnucash-guide.mobi">
+        <a href="<?=$top_dir;?>/docs/v<?=$major_stable;?>/de_DE/gnucash-guide.mobi">
           <img class="docicon" alt="mobi" title="<?php echo T_($mobi);?>" src="<?=$top_dir;?>/images/icons/mobipocket_logo.png" /></a>
       </td></tr>
       <tr class="doctr">
       <td><?php echo T_("Italian");?> :</td><td>
-        <a href="<?=$top_dir;?>/viewdoc.phtml?rev=<?=$major_stable;?>&lang=it&doc=guide">
+        <a href="<?=$top_dir;?>/viewdoc.phtml?rev=<?=$major_stable;?>&lang=it_IT&doc=guide">
           <img class="docicon" alt="online" title="<?php echo T_($online);?>" src="<?=$top_dir;?>/images/icons/online_logo.png" /></a> |
-        <a href="<?=$top_dir;?>/docs/v<?=$major_stable;?>/it/gnucash-guide.pdf">
+        <a href="<?=$top_dir;?>/docs/v<?=$major_stable;?>/it_IT/gnucash-guide.pdf">
           <img class="docicon" alt="pdf" title="<?php echo T_($pdf);?>" src="<?=$top_dir;?>/images/icons/pdf_logo.png" /></a> |
-        <a href="<?=$top_dir;?>/docs/v<?=$major_stable;?>/it/gnucash-guide.epub">
+        <a href="<?=$top_dir;?>/docs/v<?=$major_stable;?>/it_IT/gnucash-guide.epub">
           <img class="docicon" alt="epub" title="<?php echo T_($epub);?>" src="<?=$top_dir;?>/images/icons/epub_logo.png" /></a> |
-        <a href="<?=$top_dir;?>/docs/v<?=$major_stable;?>/it/gnucash-guide.mobi">
+        <a href="<?=$top_dir;?>/docs/v<?=$major_stable;?>/it_IT/gnucash-guide.mobi">
           <img class="docicon" alt="mobi" title="<?php echo T_($mobi);?>" src="<?=$top_dir;?>/images/icons/mobipocket_logo.png" /></a>
       </td></tr>
       <tr class="doctr">
       <td><?php echo T_("Japanese");?> :</td><td>
-        <a href="<?=$top_dir;?>/viewdoc.phtml?rev=<?=$major_stable;?>&lang=ja&doc=guide">
+        <a href="<?=$top_dir;?>/viewdoc.phtml?rev=<?=$major_stable;?>&lang=ja_JP&doc=guide">
           <img class="docicon" alt="online" title="<?php echo T_($online);?>" src="<?=$top_dir;?>/images/icons/online_logo.png" /></a> |
-        <a href="<?=$top_dir;?>/docs/v<?=$major_stable;?>/ja/gnucash-guide.pdf">
+        <a href="<?=$top_dir;?>/docs/v<?=$major_stable;?>/ja_JA/gnucash-guide.pdf">
           <img class="docicon" alt="pdf" title="<?php echo T_($pdf);?>" src="<?=$top_dir;?>/images/icons/pdf_logo.png" /></a> |
-        <a href="<?=$top_dir;?>/docs/v<?=$major_stable;?>/ja/gnucash-guide.epub">
+        <a href="<?=$top_dir;?>/docs/v<?=$major_stable;?>/ja_JA/gnucash-guide.epub">
           <img class="docicon" alt="epub" title="<?php echo T_($epub);?>" src="<?=$top_dir;?>/images/icons/epub_logo.png" /></a> |
-        <a href="<?=$top_dir;?>/docs/v<?=$major_stable;?>/ja/gnucash-guide.mobi">
+        <a href="<?=$top_dir;?>/docs/v<?=$major_stable;?>/ja_JA/gnucash-guide.mobi">
           <img class="docicon" alt="mobi" title="<?php echo T_($mobi);?>" src="<?=$top_dir;?>/images/icons/mobipocket_logo.png" /></a>
       </td></tr>
     </tbody>
@@ -167,24 +167,24 @@ if ($old_stable) { ?>
       </td></tr>
       <tr class="doctr">
       <td><?php echo T_("German");?> :</td><td>
-        <a href="<?=$top_dir;?>/viewdoc.phtml?rev=<?=$major_old_stable;?>&lang=de&doc=help">
+        <a href="<?=$top_dir;?>/viewdoc.phtml?rev=<?=$major_old_stable;?>&lang=de_DE&doc=help">
           <img class="docicon" alt="online" title="<?php echo T_($online);?>" src="<?=$top_dir;?>/images/icons/online_logo.png" /></a> |
-        <a href="<?=$top_dir;?>/docs/v<?=$major_old_stable;?>/de/gnucash-help.pdf">
+        <a href="<?=$top_dir;?>/docs/v<?=$major_old_stable;?>/de_DE/gnucash-help.pdf">
           <img class="docicon" alt="pdf" title="<?php echo T_($pdf);?>" src="<?=$top_dir;?>/images/icons/pdf_logo.png" /></a> |
-        <a href="<?=$top_dir;?>/docs/v<?=$major_old_stable;?>/de/gnucash-help.epubf">
+        <a href="<?=$top_dir;?>/docs/v<?=$major_old_stable;?>/de_DE/gnucash-help.epubf">
           <img class="docicon" alt="epub" title="<?php echo T_($epub);?>" src="<?=$top_dir;?>/images/icons/epub_logo.png" /></a> |
-        <a href="<?=$top_dir;?>/docs/v<?=$major_old_stable;?>/de/gnucash-help.mobi">
+        <a href="<?=$top_dir;?>/docs/v<?=$major_old_stable;?>/de_DE/gnucash-help.mobi">
           <img class="docicon" alt="mobi" title="<?php echo T_($mobi);?>" src="<?=$top_dir;?>/images/icons/mobipocket_logo.png" /></a>
       </td></tr>
       <tr class="doctr">
       <td><?php echo T_("Italian");?> :</td><td>
-        <a href="<?=$top_dir;?>/viewdoc.phtml?rev=<?=$major_old_stable;?>&lang=it&doc=help">
+        <a href="<?=$top_dir;?>/viewdoc.phtml?rev=<?=$major_old_stable;?>&lang=it_IT&doc=help">
           <img class="docicon" alt="online" title="<?php echo T_($online);?>" src="<?=$top_dir;?>/images/icons/online_logo.png" /></a> |
-        <a href="<?=$top_dir;?>/docs/v<?=$major_old_stable;?>/it/gnucash-help.pdf">
+        <a href="<?=$top_dir;?>/docs/v<?=$major_old_stable;?>/it_IT/gnucash-help.pdf">
           <img class="docicon" alt="pdf" title="<?php echo T_($pdf);?>" src="<?=$top_dir;?>/images/icons/pdf_logo.png" /></a> |
-        <a href="<?=$top_dir;?>/docs/v<?=$major_old_stable;?>/it/gnucash-help.epub">
+        <a href="<?=$top_dir;?>/docs/v<?=$major_old_stable;?>/it_IT/gnucash-help.epub">
           <img class="docicon" alt="epub" title="<?php echo T_($epub);?>" src="<?=$top_dir;?>/images/icons/epub_logo.png" /></a> |
-        <a href="<?=$top_dir;?>/docs/v<?=$major_old_stable;?>/it/gnucash-help.mobi">
+        <a href="<?=$top_dir;?>/docs/v<?=$major_old_stable;?>/it_IT/gnucash-help.mobi">
           <img class="docicon" alt="mobi" title="<?php echo T_($mobi);?>" src="<?=$top_dir;?>/images/icons/mobipocket_logo.png" /></a>
       </td></tr>
     </tbody>
@@ -206,35 +206,35 @@ if ($old_stable) { ?>
       </td></tr>
       <tr class="doctr">
       <td><?php echo T_("German");?> :</td><td>
-        <a href="<?=$top_dir;?>/viewdoc.phtml?rev=<?=$major_old_stable;?>&lang=de&doc=guide">
+        <a href="<?=$top_dir;?>/viewdoc.phtml?rev=<?=$major_old_stable;?>&lang=de_DE&doc=guide">
           <img class="docicon" alt="online" title="<?php echo T_($online);?>" src="<?=$top_dir;?>/images/icons/online_logo.png" /></a> |
-        <a href="<?=$top_dir;?>/docs/v<?=$major_old_stable;?>/de/gnucash-guide.pdf">
+        <a href="<?=$top_dir;?>/docs/v<?=$major_old_stable;?>/de_DE/gnucash-guide.pdf">
           <img class="docicon" alt="pdf" title="<?php echo T_($pdf);?>" src="<?=$top_dir;?>/images/icons/pdf_logo.png" /></a> |
-        <a href="<?=$top_dir;?>/docs/v<?=$major_old_stable;?>/de/gnucash-guide.epub">
+        <a href="<?=$top_dir;?>/docs/v<?=$major_old_stable;?>/de_DE/gnucash-guide.epub">
           <img class="docicon" alt="epub" title="<?php echo T_($epub);?>" src="<?=$top_dir;?>/images/icons/epub_logo.png" /></a> |
-        <a href="<?=$top_dir;?>/docs/v<?=$major_old_stable;?>/de/gnucash-guide.mobi">
+        <a href="<?=$top_dir;?>/docs/v<?=$major_old_stable;?>/de_DE/gnucash-guide.mobi">
           <img class="docicon" alt="mobi" title="<?php echo T_($mobi);?>" src="<?=$top_dir;?>/images/icons/mobipocket_logo.png" /></a>
       </td></tr>
       <tr class="doctr">
       <td><?php echo T_("Italian");?> :</td><td>
-        <a href="<?=$top_dir;?>/viewdoc.phtml?rev=<?=$major_old_stable;?>&lang=it&doc=guide">
+        <a href="<?=$top_dir;?>/viewdoc.phtml?rev=<?=$major_old_stable;?>&lang=it_IT&doc=guide">
           <img class="docicon" alt="online" title="<?php echo T_($online);?>" src="<?=$top_dir;?>/images/icons/online_logo.png" /></a> |
-        <a href="<?=$top_dir;?>/docs/v<?=$major_old_stable;?>/it/gnucash-guide.pdf">
+        <a href="<?=$top_dir;?>/docs/v<?=$major_old_stable;?>/it_IT/gnucash-guide.pdf">
           <img class="docicon" alt="pdf" title="<?php echo T_($pdf);?>" src="<?=$top_dir;?>/images/icons/pdf_logo.png" /></a> |
-        <a href="<?=$top_dir;?>/docs/v<?=$major_old_stable;?>/it/gnucash-guide.epub">
+        <a href="<?=$top_dir;?>/docs/v<?=$major_old_stable;?>/it_IT/gnucash-guide.epub">
           <img class="docicon" alt="epub" title="<?php echo T_($epub);?>" src="<?=$top_dir;?>/images/icons/epub_logo.png" /></a> |
-        <a href="<?=$top_dir;?>/docs/v<?=$major_old_stable;?>/it/gnucash-guide.mobi">
+        <a href="<?=$top_dir;?>/docs/v<?=$major_old_stable;?>/it_IT/gnucash-guide.mobi">
           <img class="docicon" alt="mobi" title="<?php echo T_($mobi);?>" src="<?=$top_dir;?>/images/icons/mobipocket_logo.png" /></a>
       </td></tr>
       <tr class="doctr">
       <td><?php echo T_("Japanese");?> :</td><td>
-        <a href="<?=$top_dir;?>/viewdoc.phtml?rev=<?=$major_old_stable;?>&lang=ja&doc=guide">
+        <a href="<?=$top_dir;?>/viewdoc.phtml?rev=<?=$major_old_stable;?>&lang=ja_JP&doc=guide">
           <img class="docicon" alt="online" title="<?php echo T_($online);?>" src="<?=$top_dir;?>/images/icons/online_logo.png" /></a> |
-        <a href="<?=$top_dir;?>/docs/v<?=$major_old_stable;?>/ja/gnucash-guide.pdf">
+        <a href="<?=$top_dir;?>/docs/v<?=$major_old_stable;?>/ja_JA/gnucash-guide.pdf">
           <img class="docicon" alt="pdf" title="<?php echo T_($pdf);?>" src="<?=$top_dir;?>/images/icons/pdf_logo.png" /></a> |
-        <a href="<?=$top_dir;?>/docs/v<?=$major_old_stable;?>/ja/gnucash-guide.epub">
+        <a href="<?=$top_dir;?>/docs/v<?=$major_old_stable;?>/ja_JA/gnucash-guide.epub">
           <img class="docicon" alt="epub" title="<?php echo T_($epub);?>" src="<?=$top_dir;?>/images/icons/epub_logo.png" /></a> |
-        <a href="<?=$top_dir;?>/docs/v<?=$major_old_stable;?>/ja/gnucash-guide.mobi">
+        <a href="<?=$top_dir;?>/docs/v<?=$major_old_stable;?>/ja_JA/gnucash-guide.mobi">
           <img class="docicon" alt="mobi" title="<?php echo T_($mobi);?>" src="<?=$top_dir;?>/images/icons/mobipocket_logo.png" /></a>
       </td></tr>
     </tbody>
@@ -277,7 +277,7 @@ if ($old_stable) { ?>
       </td></tr>
       <tr class="doctr">
       <td><?php echo T_("German");?> :</td><td>
-        <a href="<?=$top_dir;?>/viewdoc.phtml?rev=trunk&lang=de&doc=help">
+        <a href="<?=$top_dir;?>/viewdoc.phtml?rev=trunk&lang=de_DE&doc=help">
           <img class="docicon" alt="online" title="<?php echo T_($online);?>" src="<?=$top_dir;?>/images/icons/online_logo.png" /></a> |
         <a href="http://code.gnucash.org/docs/de/gnucash-help.pdf">
           <img class="docicon" alt="pdf" title="<?php echo T_($pdf);?>" src="<?=$top_dir;?>/images/icons/pdf_logo.png" /></a> |
@@ -288,7 +288,7 @@ if ($old_stable) { ?>
       </td></tr>
       <tr class="doctr">
       <td><?php echo T_("Italian");?> :</td><td>
-        <a href="<?=$top_dir;?>/viewdoc.phtml?rev=trunk&lang=it&doc=help">
+        <a href="<?=$top_dir;?>/viewdoc.phtml?rev=trunk&lang=it_IT&doc=help">
           <img class="docicon" alt="online" title="<?php echo T_($online);?>" src="<?=$top_dir;?>/images/icons/online_logo.png" /></a> |
         <a href="http://code.gnucash.org/docs/it/gnucash-help.pdf">
           <img class="docicon" alt="pdf" title="<?php echo T_($pdf);?>" src="<?=$top_dir;?>/images/icons/pdf_logo.png" /></a> |
@@ -316,7 +316,7 @@ if ($old_stable) { ?>
       </td></tr>
       <tr class="doctr">
       <td><?php echo T_("German");?> :</td><td>
-        <a href="<?=$top_dir;?>/viewdoc.phtml?rev=trunk&lang=de&doc=guide">
+        <a href="<?=$top_dir;?>/viewdoc.phtml?rev=trunk&lang=de_DE&doc=guide">
           <img class="docicon" alt="online" title="<?php echo T_($online);?>" src="<?=$top_dir;?>/images/icons/online_logo.png" /></a> |
         <a href="http://code.gnucash.org/docs/de/gnucash-guide.pdf">
           <img class="docicon" alt="pdf" title="<?php echo T_($pdf);?>" src="<?=$top_dir;?>/images/icons/pdf_logo.png" /></a> |
@@ -327,7 +327,7 @@ if ($old_stable) { ?>
       </td></tr>
       <tr class="doctr">
       <td><?php echo T_("Italian");?> :</td><td>
-        <a href="<?=$top_dir;?>/viewdoc.phtml?rev=trunk&lang=it&doc=guide">
+        <a href="<?=$top_dir;?>/viewdoc.phtml?rev=trunk&lang=it_IT&doc=guide">
           <img class="docicon" alt="online" title="<?php echo T_($online);?>" src="<?=$top_dir;?>/images/icons/online_logo.png" /></a> |
         <a href="http://code.gnucash.org/docs/it/gnucash-guide.pdf">
           <img class="docicon" alt="pdf" title="<?php echo T_($pdf);?>" src="<?=$top_dir;?>/images/icons/pdf_logo.png" /></a> |
@@ -338,7 +338,7 @@ if ($old_stable) { ?>
       </td></tr>
       <tr class="doctr">
       <td><?php echo T_("Japanese");?> :</td><td>
-        <a href="<?=$top_dir;?>/viewdoc.phtml?rev=trunk&lang=ja&doc=guide">
+        <a href="<?=$top_dir;?>/viewdoc.phtml?rev=trunk&lang=ja_JP&doc=guide">
           <img class="docicon" alt="online" title="<?php echo T_($online);?>" src="<?=$top_dir;?>/images/icons/online_logo.png" /></a> |
         <a href="http://code.gnucash.org/docs/ja/gnucash-guide.pdf">
           <img class="docicon" alt="pdf" title="<?php echo T_($pdf);?>" src="<?=$top_dir;?>/images/icons/pdf_logo.png" /></a> |
diff --git a/viewdoc.phtml b/viewdoc.phtml
index 42da467..fa2c2a7 100644
--- a/viewdoc.phtml
+++ b/viewdoc.phtml
@@ -86,8 +86,8 @@ if (isset ($_GET["rev"])) {
 # updated if list of languages in which the documentation is available changes
 if ($showrev == "trunk") {
   $basepath = "http://code.gnucash.org/docs";
-  $trunk_langs = array ( $helpdoc => array( "C", "de", "it"),
-                         $tcdoc   => array( "C", "de", "it", "ja"));
+  $trunk_langs = array ( $helpdoc => array( "C", "de_DE", "it_IT"),
+                         $tcdoc   => array( "C", "de_DE", "it_IT", "ja_JP"));
   if (!in_array ($showlang, $trunk_langs[$showdoc])) {
     $showlang    = "C";
     $req_lang_ok = false;



Summary of changes:
 docs.phtml    |   90 ++++++++++++++++++++++++++++----------------------------
 viewdoc.phtml |    4 +-
 2 files changed, 47 insertions(+), 47 deletions(-)



More information about the gnucash-changes mailing list