gnucash-htdocs master: Multiple changes pushed
John Ralls
jralls at code.gnucash.org
Sat Jan 4 16:24:24 EST 2014
Updated via https://github.com/Gnucash/gnucash-htdocs/commit/8caf4280 (commit)
via https://github.com/Gnucash/gnucash-htdocs/commit/0025c0e1 (commit)
from https://github.com/Gnucash/gnucash-htdocs/commit/bf0d3c3c (commit)
commit 8caf42803146513ea9267a9093c7a6af99d2d25e
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Jan 4 13:24:02 2014 -0800
Revert "Fix the 2.6 documentation links for two-letter locale codes"
This reverts commit dbc305000cbabb45f36c684ca552d04da82c8af5.
Doesn't actually fix anything.
diff --git a/docs.phtml b/docs.phtml
index 5527940..b9194c0 100644
--- a/docs.phtml
+++ b/docs.phtml
@@ -57,22 +57,22 @@ include("externals/menu.phtml");
<td><?php echo T_("German");?> :</td><td>
<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_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>
@@ -96,9 +96,9 @@ include("externals/menu.phtml");
<td><?php echo T_("German");?> :</td><td>
<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_DE/gnucash-guide.mobi">
<img class="docicon" alt="mobi" title="<?php echo T_($mobi);?>" src="<?=$top_dir;?>/images/icons/mobipocket_logo.png" /></a>
@@ -107,16 +107,16 @@ include("externals/menu.phtml");
<td><?php echo T_("Italian");?> :</td><td>
<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_JA/gnucash-guide.pdf">
<img class="docicon" alt="pdf" title="<?php echo T_($pdf);?>" src="<?=$top_dir;?>/images/icons/pdf_logo.png" /></a> |
commit 0025c0e18a5a69782f494ae8a1c8e934c4b18ee4
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Jan 4 13:23:21 2014 -0800
Revert "Fix viewdocs.phtml to accept two-letter or three-letter language codes"
This reverts commit bf0d3c3ce4c1b605707bc7934c71ce7300590810.
Makes the problem worse.
diff --git a/viewdoc.phtml b/viewdoc.phtml
index 9cfe8e0..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", "de_DE", "it", "it_IT"),
- $tcdoc => array( "C", "de" "de_DE", "it", "it_IT", "ja", "ja_JP"));
+ $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 | 24 ++++++++++++------------
viewdoc.phtml | 4 ++--
2 files changed, 14 insertions(+), 14 deletions(-)
More information about the gnucash-changes
mailing list