Replace five-character locale code links with two-character

Hoping to remove the softlinks.
Gnucash · Jan 28, 2014 · 4cf22e9 · 4cf22e9
1 parent 8aa14a2
commit 4cf22e9
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 47 deletions.
diff --git 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_DE&doc=help">
+        <a href="<?=$top_dir;?>/viewdoc.phtml?rev=<?=$major_stable;?>&lang=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_DE/gnucash-help.pdf">
+        <a href="<?=$top_dir;?>/docs/v<?=$major_stable;?>/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_DE/gnucash-help.epubf">
+        <a href="<?=$top_dir;?>/docs/v<?=$major_stable;?>/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_DE/gnucash-help.mobi">
+        <a href="<?=$top_dir;?>/docs/v<?=$major_stable;?>/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_IT&doc=help">
+        <a href="<?=$top_dir;?>/viewdoc.phtml?rev=<?=$major_stable;?>&lang=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_IT/gnucash-help.pdf">
+        <a href="<?=$top_dir;?>/docs/v<?=$major_stable;?>/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_IT/gnucash-help.epub">
+        <a href="<?=$top_dir;?>/docs/v<?=$major_stable;?>/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_IT/gnucash-help.mobi">
+        <a href="<?=$top_dir;?>/docs/v<?=$major_stable;?>/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_DE&doc=guide">
+        <a href="<?=$top_dir;?>/viewdoc.phtml?rev=<?=$major_stable;?>&lang=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_DE/gnucash-guide.pdf">
+        <a href="<?=$top_dir;?>/docs/v<?=$major_stable;?>/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_DE/gnucash-guide.epub">
+        <a href="<?=$top_dir;?>/docs/v<?=$major_stable;?>/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_DE/gnucash-guide.mobi">
+        <a href="<?=$top_dir;?>/docs/v<?=$major_stable;?>/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_IT&doc=guide">
+        <a href="<?=$top_dir;?>/viewdoc.phtml?rev=<?=$major_stable;?>&lang=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_IT/gnucash-guide.pdf">
+        <a href="<?=$top_dir;?>/docs/v<?=$major_stable;?>/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_IT/gnucash-guide.epub">
+        <a href="<?=$top_dir;?>/docs/v<?=$major_stable;?>/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_IT/gnucash-guide.mobi">
+        <a href="<?=$top_dir;?>/docs/v<?=$major_stable;?>/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_JP&doc=guide">
+        <a href="<?=$top_dir;?>/viewdoc.phtml?rev=<?=$major_stable;?>&lang=ja&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_JA/gnucash-guide.pdf">
+        <a href="<?=$top_dir;?>/docs/v<?=$major_stable;?>/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_JA/gnucash-guide.epub">
+        <a href="<?=$top_dir;?>/docs/v<?=$major_stable;?>/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_JA/gnucash-guide.mobi">
+        <a href="<?=$top_dir;?>/docs/v<?=$major_stable;?>/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_DE&doc=help">
+        <a href="<?=$top_dir;?>/viewdoc.phtml?rev=<?=$major_old_stable;?>&lang=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_DE/gnucash-help.pdf">
+        <a href="<?=$top_dir;?>/docs/v<?=$major_old_stable;?>/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_DE/gnucash-help.epubf">
+        <a href="<?=$top_dir;?>/docs/v<?=$major_old_stable;?>/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_DE/gnucash-help.mobi">
+        <a href="<?=$top_dir;?>/docs/v<?=$major_old_stable;?>/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_IT&doc=help">
+        <a href="<?=$top_dir;?>/viewdoc.phtml?rev=<?=$major_old_stable;?>&lang=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_IT/gnucash-help.pdf">
+        <a href="<?=$top_dir;?>/docs/v<?=$major_old_stable;?>/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_IT/gnucash-help.epub">
+        <a href="<?=$top_dir;?>/docs/v<?=$major_old_stable;?>/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_IT/gnucash-help.mobi">
+        <a href="<?=$top_dir;?>/docs/v<?=$major_old_stable;?>/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_DE&doc=guide">
+        <a href="<?=$top_dir;?>/viewdoc.phtml?rev=<?=$major_old_stable;?>&lang=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_DE/gnucash-guide.pdf">
+        <a href="<?=$top_dir;?>/docs/v<?=$major_old_stable;?>/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_DE/gnucash-guide.epub">
+        <a href="<?=$top_dir;?>/docs/v<?=$major_old_stable;?>/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_DE/gnucash-guide.mobi">
+        <a href="<?=$top_dir;?>/docs/v<?=$major_old_stable;?>/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_IT&doc=guide">
+        <a href="<?=$top_dir;?>/viewdoc.phtml?rev=<?=$major_old_stable;?>&lang=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_IT/gnucash-guide.pdf">
+        <a href="<?=$top_dir;?>/docs/v<?=$major_old_stable;?>/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_IT/gnucash-guide.epub">
+        <a href="<?=$top_dir;?>/docs/v<?=$major_old_stable;?>/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_IT/gnucash-guide.mobi">
+        <a href="<?=$top_dir;?>/docs/v<?=$major_old_stable;?>/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_JP&doc=guide">
+        <a href="<?=$top_dir;?>/viewdoc.phtml?rev=<?=$major_old_stable;?>&lang=ja&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_JA/gnucash-guide.pdf">
+        <a href="<?=$top_dir;?>/docs/v<?=$major_old_stable;?>/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_JA/gnucash-guide.epub">
+        <a href="<?=$top_dir;?>/docs/v<?=$major_old_stable;?>/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_JA/gnucash-guide.mobi">
+        <a href="<?=$top_dir;?>/docs/v<?=$major_old_stable;?>/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_DE&doc=help">
+        <a href="<?=$top_dir;?>/viewdoc.phtml?rev=trunk&lang=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_IT&doc=help">
+        <a href="<?=$top_dir;?>/viewdoc.phtml?rev=trunk&lang=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_DE&doc=guide">
+        <a href="<?=$top_dir;?>/viewdoc.phtml?rev=trunk&lang=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_IT&doc=guide">
+        <a href="<?=$top_dir;?>/viewdoc.phtml?rev=trunk&lang=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_JP&doc=guide">
+        <a href="<?=$top_dir;?>/viewdoc.phtml?rev=trunk&lang=ja&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
@@ -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_DE", "it_IT"),
-                         $tcdoc   => array( "C", "de_DE", "it_IT", "ja_JP"));
+  $trunk_langs = array ( $helpdoc => array( "C", "de", "it"),
+                         $tcdoc   => array( "C", "de", "it", "ja"));
   if (!in_array ($showlang, $trunk_langs[$showdoc])) {
     $showlang    = "C";
     $req_lang_ok = false;