Paul Vriens : transl: Merge some of the menu generation.

Alexandre Julliard julliard at winehq.org
Tue Aug 18 10:29:44 CDT 2009


Module: tools
Branch: master
Commit: a1c05fbe629ed24a1eba276be1358e43ffa38677
URL:    http://source.winehq.org/git/tools.git/?a=commit;h=a1c05fbe629ed24a1eba276be1358e43ffa38677

Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date:   Fri Aug 14 12:47:27 2009 +0200

transl: Merge some of the menu generation.

---

 transl/lang.php     |    2 +-
 transl/lib.php      |    9 +++++++++
 transl/resfile.php  |    2 +-
 transl/resource.php |    3 +--
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/transl/lang.php b/transl/lang.php
index 91aee9d..5f0fd6f 100644
--- a/transl/lang.php
+++ b/transl/lang.php
@@ -88,7 +88,7 @@ function dump_table($table)
     <title><?php echo get_lang_name($lang) ?> language - Wine translations</title>
 </head>
 
-<p><?php dump_menu_root() ?> &gt; <?php dump_menu_lang($lang, FALSE)?> </p>
+<p><?php dump_menu_lang($lang, FALSE); ?> </p>
 <div class="main">
 <h1><?php echo "Language: ".get_lang_name($lang) ?></h1>
 
diff --git a/transl/lib.php b/transl/lib.php
index e584f3c..9e5b1a7 100644
--- a/transl/lib.php
+++ b/transl/lib.php
@@ -252,6 +252,9 @@ function dump_menu_root()
 
 function dump_menu_lang($lang, $link = TRUE)
 {
+    dump_menu_root();
+    echo " &gt; ";
+
     if ($link)
         echo gen_lang_a($lang);
     echo get_lang_name($lang);
@@ -261,6 +264,9 @@ function dump_menu_lang($lang, $link = TRUE)
 
 function dump_menu_resfile($lang, $resfile, $link = TRUE)
 {
+    dump_menu_lang($lang);
+    echo " &gt; ";
+
     if ($link)
         echo gen_resfile_a($lang, $resfile);
     echo get_resfile_name($resfile);
@@ -270,6 +276,9 @@ function dump_menu_resfile($lang, $resfile, $link = TRUE)
 
 function dump_menu_resource($lang, $resfile, $type, $id)
 {
+    dump_menu_resfile($lang, $resfile);
+    echo " &gt; ";
+
     echo get_resource_name($type, $id);
 }
 
diff --git a/transl/resfile.php b/transl/resfile.php
index f956845..29909ed 100644
--- a/transl/resfile.php
+++ b/transl/resfile.php
@@ -15,7 +15,7 @@ $msgs = array();
     <title>Module <?php echo $resfile?> - Wine translations</title>
 </head>
 
-<?php dump_menu_root() ?> &gt <?php dump_menu_lang($lang) ?> &gt <?php dump_menu_resfile($lang, $resfile, FALSE) ?>
+<?php dump_menu_resfile($lang, $resfile, FALSE); ?>
 <div class="main">
 <h1>Module <?php echo $resfile?></h1>
 
diff --git a/transl/resource.php b/transl/resource.php
index 4fdd9f0..d8f1e20 100644
--- a/transl/resource.php
+++ b/transl/resource.php
@@ -18,8 +18,7 @@ $compare = isset($_REQUEST['compare']);
     <title><?php echo get_resource_name($type, $id) ?> from <?php echo $resfile?> - Wine translation</title>
 </head>
 <body>
-<?php dump_menu_root() ?> &gt <?php dump_menu_lang($lang) ?> &gt <?php dump_menu_resfile($lang, $resfile) ?> &gt
-<?php dump_menu_resource($lang, $resfile, $type, $id) ?>
+<?php dump_menu_resource($lang, $resfile, $type, $id); ?>
 <div class="main">
 <h1>Dump of <?php echo get_resource_name($type, $id) ?></h1>
 




More information about the wine-cvs mailing list