July 2009 - Wine-commits - list.winehq.org

Alexandre Julliard : transl: Store all output data in a single directory.
by Alexandre Julliard 23 Jul '09

23 Jul '09

Module: tools Branch: master Commit: 6060307e9768c1f1b6126cbbe3cf3b43b1d938f5 URL: http://source.winehq.org/git/tools.git/?a=commit;h=6060307e9768c1f1b6126cbb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 23 12:44:21 2009 +0200 transl: Store all output data in a single directory. --- transl/.gitignore | 3 +-- transl/php/config.php | 2 +- transl/php/index.php | 4 ++-- transl/php/lang.php | 4 ++-- transl/php/lib.php | 5 +++-- transl/php/resfile.php | 2 +- transl/php/runlog.php | 4 ++-- transl/scripts/Master.sh | 21 ++++++++------------- transl/scripts/checkmakefile.pl | 12 ++++++------ winetest/make-winetest | 15 ++++++--------- 10 files changed, 32 insertions(+), 40 deletions(-) diff --git a/transl/.gitignore b/transl/.gitignore index 9e6aaf8..3be2009 100644 --- a/transl/.gitignore +++ b/transl/.gitignore @@ -2,5 +2,4 @@ /scripts/config /scripts/local-posthook.sh /scripts/local-prehook.sh -/php/dumps -/php/langs \ No newline at end of file +/php/data diff --git a/transl/php/config.php b/transl/php/config.php index 1d5f276..eb14c09 100644 --- a/transl/php/config.php +++ b/transl/php/config.php @@ -1,5 +1,5 @@ <?php -$DATAROOT = "."; +$DATAROOT = "data"; $TITLE_APPENDIX = " - Wine 1.1.x"; $TITLE_DESCR = "This page shows the translation status of the most recent Wine 1.1.x. To see the Wine 1.0.x line see <a href=\"http://www.mikolaj.zalewski.pl/wine-transl/1.0.x/\">here</a>"; ?> diff --git a/transl/php/index.php b/transl/php/index.php index 904fc47..5a1772e 100644 --- a/transl/php/index.php +++ b/transl/php/index.php @@ -2,7 +2,7 @@ include_once("config.php"); include_once("lib.php"); -$summary = fopen("$DATAROOT/langs/summary", "r"); +$summary = fopen("$DATAROOT/summary", "r"); $transl = array(); $sum = 0; while ($line = fgets($summary, 1024)) @@ -118,7 +118,7 @@ for ($i = 0; $i < count($transl); $i++) </div> </div> <?php -if ($time = filemtime("$DATAROOT/langs/summary")) +if ($time = filemtime("$DATAROOT/summary")) { echo "<p><small>Generated on ".gmdate("j M Y, G:i:s T", $time)." (see <a href=\"runlog.php\">run log</a>)</small></p>"; } diff --git a/transl/php/lang.php b/transl/php/lang.php index 21b2dea..9f36d0c 100644 --- a/transl/php/lang.php +++ b/transl/php/lang.php @@ -12,10 +12,10 @@ function parse_file($lang) { global $transl, $partial, $notransl; global $DATAROOT; - if (!file_exists("$DATAROOT/langs/$lang")) + if (!file_exists("$DATAROOT/$lang")) return; - $file = fopen("$DATAROOT/langs/$lang", "r"); + $file = fopen("$DATAROOT/$lang", "r"); $curr_file = ""; while ($line = fgets($file, 4096)) { diff --git a/transl/php/lib.php b/transl/php/lib.php index 1499d7b..8d23291 100644 --- a/transl/php/lib.php +++ b/transl/php/lib.php @@ -47,13 +47,14 @@ function res_enum($header, $f) function enum_locale_names() { include_once "lib_res.php"; + include "config.php"; global $LOCALE_NAMES; if (!empty($LOCALE_NAMES)) { return; } - $res = new ResFile("dumps/res/dlls-kernel32.res"); + $res = new ResFile("$DATAROOT/res/dlls-kernel32.res"); $res->enumResources("res_enum"); ksort($LOCALE_NAMES); } @@ -160,7 +161,7 @@ function get_res_path($resfile) global $DATAROOT; $resfile = preg_replace("/\\.rc(#.*)?$/", "", $resfile); - return "$DATAROOT/dumps/res/".preg_replace("/[^a-zA-Z0-9]/", "-", $resfile).".res"; + return "$DATAROOT/res/".preg_replace("/[^a-zA-Z0-9]/", "-", $resfile).".res"; } function get_resfile_name($resfile) diff --git a/transl/php/resfile.php b/transl/php/resfile.php index 45bae3a..4fcd2d7 100644 --- a/transl/php/resfile.php +++ b/transl/php/resfile.php @@ -29,7 +29,7 @@ if (preg_match("/:00/", $lang)) exit(); } -$file = fopen("$DATAROOT/langs/$lang", "r"); +$file = fopen("$DATAROOT/$lang", "r"); while ($line = fgets($file, 4096)) { if (preg_match("@$resfile: (.*)@", $line, $m)) diff --git a/transl/php/runlog.php b/transl/php/runlog.php index f6e0591..ac4bbaa 100644 --- a/transl/php/runlog.php +++ b/transl/php/runlog.php @@ -2,6 +2,6 @@ include("config.php"); header("Content-type: text/plain"); -$f = fopen("$DATAROOT/dumps/run.log", "r"); +$f = fopen("$DATAROOT/run.log", "r"); fpassthru($f); -?> \ No newline at end of file +?> diff --git a/transl/scripts/Master.sh b/transl/scripts/Master.sh index 4a0df39..0baa873 100755 --- a/transl/scripts/Master.sh +++ b/transl/scripts/Master.sh @@ -39,28 +39,23 @@ if [ "$PREPARE_TREES" -eq 1 ]; then fi # Do cleanup for new run -rm -Rf $WORKDIR/langs -rm -Rf $WORKDIR/dumps -mkdir $WORKDIR/langs -mkdir $WORKDIR/dumps -mkdir $WORKDIR/dumps/res +rm -Rf $WORKDIR/data +mkdir $WORKDIR/data +mkdir $WORKDIR/data/res # Analyze all the Makefiles -$SCRIPTSDIR/checkmakefile.pl -S "$SOURCEROOT" -T "$BUILDROOT" -t "$WRCROOT" -w "$WORKDIR" 2>>"$WORKDIR/run.log" || exit +./checkmakefile.pl -S "$SOURCEROOT" -T "$BUILDROOT" -t "$WRCROOT" -w "$WORKDIR/data" 2>>"$WORKDIR/run.log" || exit # Show any changes in the log diff -u $WORKDIR/run.log.old $WORKDIR/run.log # Copy the new data from the working directory to the PHP scripts input -mv -f $DESTDIR/langs $DESTDIR/langs.old -mv -f $DESTDIR/dumps $DESTDIR/dumps.old -mv -f $WORKDIR/langs $DESTDIR/langs -mv -f $WORKDIR/dumps $DESTDIR/dumps -cp -f $WORKDIR/run.log $DESTDIR/dumps/run.log +mv -f $DESTDIR/data $DESTDIR/data.old +mv -f $WORKDIR/data $DESTDIR/data +cp -f $WORKDIR/run.log $DESTDIR/data/run.log # Deleting can take a bit longer so we do it after the new version is set up -rm -Rf $DESTDIR/langs.old -rm -Rf $DESTDIR/dumps.old +rm -Rf $DESTDIR/data.old # Optional hooks if [ -x ./local-posthook.sh ]; then diff --git a/transl/scripts/checkmakefile.pl b/transl/scripts/checkmakefile.pl index 66a0909..ae964f0 100755 --- a/transl/scripts/checkmakefile.pl +++ b/transl/scripts/checkmakefile.pl @@ -80,7 +80,7 @@ sub mycheck my $objs = join( " ", map { (my $ret = "$objdir/$dir/$_") =~ s/.rc$/.res/; $ret; } @rcfiles ); shell "make -C $objdir/$dir -s $targets"; - shell "$toolsdir/tools/winebuild/winebuild --resources -o $workdir/dumps/res/$norm_fn.res $objs"; + shell "$toolsdir/tools/winebuild/winebuild --resources -o $workdir/res/$norm_fn.res $objs"; my $type = -1; my $resource; @@ -263,7 +263,7 @@ sub mycheck next if (($lang eq "009:01") && ($transl_count{$lang} == 0)); - open(LANGOUT, ">>$workdir/langs/$lang"); + open(LANGOUT, ">>$workdir/$lang"); print LANGOUT "FILE STAT $dir ".($transl_count{$lang}+0)." ".($missing_count{$lang}+0)." ".($err_count{$lang}+0)."\n"; foreach my $warn (@{$warns{$lang}}) @@ -297,7 +297,7 @@ sub mycheck my @transl = grep {$_ eq $lang} keys %file_langs; if ($#transl == -1) { - open(LANGOUT, ">>$workdir/langs/$lang"); + open(LANGOUT, ">>$workdir/$lang"); print LANGOUT "FILE NONE $dir 0 ".$transl_count{"009:01"}." 0\n"; close(LANGOUT); } @@ -344,7 +344,7 @@ while (@ARGV && $ARGV[0] =~ /^-/) $srcdir ||= $CONFIG{"SOURCEROOT"}; $objdir ||= $CONFIG{"BUILDROOT"} || $srcdir; $toolsdir ||= $CONFIG{"WRCROOT"} || $objdir; -$workdir ||= $CONFIG{"WORKDIR"}; +$workdir ||= $CONFIG{"WORKDIR"} . "/data"; $wrc = $toolsdir . "/tools/wrc/wrc"; if ($srcdir eq "" || $wrc eq "/tools/wrc/wrc" || $workdir eq "") @@ -427,13 +427,13 @@ foreach my $path (keys %checks) } # create the summary file -open(OUT, ">$workdir/langs/summary"); +open(OUT, ">$workdir/summary"); foreach my $lang (keys %languages) { my $transl = 0; my $missing = 0; my $errors = 0; - open(FILE, "<$workdir/langs/$lang"); + open(FILE, "<$workdir/$lang"); while (<FILE>) { if (m/^FILE [A-Z]+ .* ([0-9]+) ([0-9]+) ([0-9]+)$/) { diff --git a/winetest/make-winetest b/winetest/make-winetest index 50903f6..2521b28 100755 --- a/winetest/make-winetest +++ b/winetest/make-winetest @@ -130,15 +130,12 @@ umask 022 # update the translations status - rm -rf work - mkdir work work/langs work/dumps work/dumps/res - $toolsdir/transl/scripts/checkmakefile.pl -S ./wine -T ./build-mingw -t ./build-native -w ./work 2>>work/run.log - mv -f $transldir/langs $transldir/langs.old - mv -f $transldir/dumps $transldir/dumps.old - mv -f work/langs $transldir/langs - mv -f work/dumps $transldir/dumps - mv -f work/run.log $transldir/dumps/run.log - rm -rf $transldir/langs.old $transldir/dumps.old + rm -rf data + mkdir data data/res + $toolsdir/transl/scripts/checkmakefile.pl -S ./wine -T ./build-mingw -t ./build-native -w ./data 2>>data/run.log + mv -f $transldir/data $transldir/data.old + mv -f data $transldir/data + rm -rf $transldir/data.old echo "translations updated"

1 0

Alexandre Julliard : transl: Don' t try to open the language file for neutral languages.
by Alexandre Julliard 23 Jul '09

23 Jul '09

Module: tools Branch: master Commit: b79864dddd6c089a4cd77c8d2c705faf0b900091 URL: http://source.winehq.org/git/tools.git/?a=commit;h=b79864dddd6c089a4cd77c8d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 23 12:40:14 2009 +0200 transl: Don't try to open the language file for neutral languages. --- transl/php/resfile.php | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/transl/php/resfile.php b/transl/php/resfile.php index 13bfd63..45bae3a 100644 --- a/transl/php/resfile.php +++ b/transl/php/resfile.php @@ -5,7 +5,6 @@ include("lib.php"); $lang = validate_lang($_REQUEST['lang']); $resfile = validate_resfile($_REQUEST['resfile']); -$file = fopen("$DATAROOT/langs/$lang", "r"); $msgs = array(); ?> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> @@ -22,6 +21,15 @@ $msgs = array(); <?php +if (preg_match("/:00/", $lang)) +{ + echo "<div class=\"contents\">"; + show_sublangs($lang); + echo "</div>"; + exit(); +} + +$file = fopen("$DATAROOT/langs/$lang", "r"); while ($line = fgets($file, 4096)) { if (preg_match("@$resfile: (.*)@", $line, $m)) @@ -32,12 +40,6 @@ while ($line = fgets($file, 4096)) if (count($msgs) == 0) { - if (preg_match("/:00/", $lang)) - { - show_sublangs($lang); - exit(); - } - echo "<div class=\"contents\">"; echo "<p>This module is not translated into ".get_lang_name($lang).".</p>\n"; echo "<ul><li>If you want to see what resources are in this module, check the "

1 0

Paul Vriens : transl: Some HTML markup fixes.
by Alexandre Julliard 23 Jul '09

23 Jul '09

Module: tools Branch: master Commit: e24cc38b0e0ad8efc68cb3379967edd8dae924b5 URL: http://source.winehq.org/git/tools.git/?a=commit;h=e24cc38b0e0ad8efc68cb337… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Jul 23 11:01:35 2009 +0200 transl: Some HTML markup fixes. --- transl/php/lib.php | 7 ++++--- transl/php/resfile.php | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/transl/php/lib.php b/transl/php/lib.php index 48ea48b..1499d7b 100644 --- a/transl/php/lib.php +++ b/transl/php/lib.php @@ -227,16 +227,17 @@ function gen_lang_a($lang) function gen_resfile_a($lang, $resfile) { - return "<a href=\"resfile.php?lang=".urlencode($lang)."&resfile=".urlencode($resfile)."\">"; + return "<a href=\"resfile.php?lang=".urlencode($lang)."&resfile=".urlencode($resfile)."\">"; } function gen_resource_a($lang, $resfile, $type, $id, $compare=FALSE) { if ($compare) - $extra = "&compare="; + $extra = "&compare="; else $extra = ""; - return "<a href=\"resource.php?lang=".urlencode($lang)."&resfile=".urlencode($resfile)."&type=".urlencode($type)."&id=".urlencode($id)."$extra\">"; + return "<a href=\"resource.php?lang=".urlencode($lang)."&resfile=".urlencode($resfile). + "&type=".urlencode($type)."&id=".urlencode($id)."$extra\">"; } function dump_menu_root() diff --git a/transl/php/resfile.php b/transl/php/resfile.php index c53ad5a..13bfd63 100644 --- a/transl/php/resfile.php +++ b/transl/php/resfile.php @@ -102,6 +102,7 @@ foreach ($msgs as $value) echo "</td><td>".$value."</td></tr>\n"; } +echo "</table>\n"; ?> </div> </html>

1 0

Paul Vriens : transl: Use a correct link for the 1.0.x translation status.
by Alexandre Julliard 23 Jul '09

23 Jul '09

Module: tools Branch: master Commit: 70699a0d5ed8641b2de7f297c2baf53a99062de7 URL: http://source.winehq.org/git/tools.git/?a=commit;h=70699a0d5ed8641b2de7f297… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Jul 23 09:39:24 2009 +0200 transl: Use a correct link for the 1.0.x translation status. --- transl/php/config.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/transl/php/config.php b/transl/php/config.php index bb6c73b..1d5f276 100644 --- a/transl/php/config.php +++ b/transl/php/config.php @@ -1,5 +1,5 @@ <?php $DATAROOT = "."; $TITLE_APPENDIX = " - Wine 1.1.x"; -$TITLE_DESCR = "This page shows the translation status of the most recent Wine 1.1.x. To see the Wine 1.0.x line see <a href=\"http://pf128.krakow.sdi.tpnet.pl/wine-transl/\">here</a>"; -?> \ No newline at end of file +$TITLE_DESCR = "This page shows the translation status of the most recent Wine 1.1.x. To see the Wine 1.0.x line see <a href=\"http://www.mikolaj.zalewski.pl/wine-transl/1.0.x/\">here</a>"; +?>

1 0

Paul Vriens : transl: Don't show English(US) as a sublanguage of English( Neutral).
by Alexandre Julliard 23 Jul '09

23 Jul '09

Module: tools Branch: master Commit: d146316c353e706d6d7ada2ad12335eeb990f9e8 URL: http://source.winehq.org/git/tools.git/?a=commit;h=d146316c353e706d6d7ada2a… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Jul 23 09:33:30 2009 +0200 transl: Don't show English(US) as a sublanguage of English(Neutral). --- transl/php/lib.php | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/transl/php/lib.php b/transl/php/lib.php index b293ec2..48ea48b 100644 --- a/transl/php/lib.php +++ b/transl/php/lib.php @@ -105,14 +105,16 @@ function get_sublangs($id) { if (preg_match("/:00/", $id)) { + global $MASTER_LANGUAGE; global $LOCALE_NAMES; enum_locale_names(); $base = preg_replace("/:00/", "", $id); $sublangs = array(); foreach ($LOCALE_NAMES as $key => $value) - if (preg_match("/$base/", $key) && ($key != $id)) - $sublangs[] = $key; + if (preg_match("/$base/", $key) && ($key != $id) && ($key != $MASTER_LANGUAGE)) + $sublangs[$key] = $value; + asort($sublangs); return $sublangs; } else @@ -131,7 +133,7 @@ function show_sublangs($id) echo "<table>\n"; echo "<tr><th>Sublanguage</th></tr>\n"; $sublangs = get_sublangs($id); - foreach ($sublangs as $key) + foreach ($sublangs as $key => $value) { echo "<tr><td>".gen_lang_a($key).get_lang_name($key)."</a></td></tr>"; }

1 0

Paul Vriens : transl: Don't use hardcoded language identifier.
by Alexandre Julliard 23 Jul '09

23 Jul '09

Module: tools Branch: master Commit: 885fa85a922cc599d24913e6df6e6b50b631f23b URL: http://source.winehq.org/git/tools.git/?a=commit;h=885fa85a922cc599d24913e6… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Jul 23 09:24:09 2009 +0200 transl: Don't use hardcoded language identifier. --- transl/php/index.php | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/transl/php/index.php b/transl/php/index.php index 4e37347..904fc47 100644 --- a/transl/php/index.php +++ b/transl/php/index.php @@ -65,13 +65,14 @@ function draw_bar($tr, $err, $sum) function nicesort($a, $b) { + global $MASTER_LANGUAGE; if ($a['translated'] != $b['translated']) return ($a['translated'] < $b['translated']); // English (Unites States) always on top - if ($a['langid'] == "009:01") + if ($a['langid'] == $MASTER_LANGUAGE) return 0; - if ($b['langid'] == "009:01") + if ($b['langid'] == $MASTER_LANGUAGE) return 1; return strcasecmp($a['name'], $b['name']); }

1 0

Paul Vriens : transl: Add a margin to the contents of a text box.
by Alexandre Julliard 23 Jul '09

23 Jul '09

Module: tools Branch: master Commit: 2a5b9f710d06f9e713ee8412821d44311ac23438 URL: http://source.winehq.org/git/tools.git/?a=commit;h=2a5b9f710d06f9e713ee8412… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Jul 23 09:20:06 2009 +0200 transl: Add a margin to the contents of a text box. --- transl/php/resfile.php | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/transl/php/resfile.php b/transl/php/resfile.php index 6145752..c53ad5a 100644 --- a/transl/php/resfile.php +++ b/transl/php/resfile.php @@ -38,6 +38,7 @@ if (count($msgs) == 0) exit(); } + echo "<div class=\"contents\">"; echo "<p>This module is not translated into ".get_lang_name($lang).".</p>\n"; echo "<ul><li>If you want to see what resources are in this module, check the " .gen_resfile_a($MASTER_LANGUAGE, $resfile).get_locale_name($MASTER_LANGUAGE)." version</a>" @@ -46,6 +47,7 @@ if (count($msgs) == 0) echo "directory in the Wine source tree and make it include a new language file for\n"; echo get_lang_name($lang)." (see $WINE_WIKI_TRANSLATIONS for a guide to\n"; echo "translating)</li>"; + echo "</div>"; exit(); }

1 0

Paul Vriens : transl: Replace $MASTER_LANGUAGE_NAME by the real locale name .
by Alexandre Julliard 23 Jul '09

23 Jul '09

Module: tools Branch: master Commit: f9071cf793f70c8f340a214dd209ba672d917b4a URL: http://source.winehq.org/git/tools.git/?a=commit;h=f9071cf793f70c8f340a214d… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Jul 23 09:10:38 2009 +0200 transl: Replace $MASTER_LANGUAGE_NAME by the real locale name. --- transl/php/lib.php | 1 - transl/php/resfile.php | 4 ++-- transl/php/resource.php | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/transl/php/lib.php b/transl/php/lib.php index bfaed8d..b293ec2 100644 --- a/transl/php/lib.php +++ b/transl/php/lib.php @@ -1,7 +1,6 @@ <?php $MASTER_LANGUAGE = "009:01"; -$MASTER_LANGUAGE_NAME = "English (US)"; $WINE_WIKI_TRANSLATIONS = "<a href=\"redirect.php?url=http://wiki.winehq.org/Translating\">http://wiki.winehq.org/Translating</a>"; diff --git a/transl/php/resfile.php b/transl/php/resfile.php index 8245e26..6145752 100644 --- a/transl/php/resfile.php +++ b/transl/php/resfile.php @@ -40,7 +40,7 @@ if (count($msgs) == 0) echo "<p>This module is not translated into ".get_lang_name($lang).".</p>\n"; echo "<ul><li>If you want to see what resources are in this module, check the " - .gen_resfile_a($MASTER_LANGUAGE, $resfile)."English (US) version</a>" + .gen_resfile_a($MASTER_LANGUAGE, $resfile).get_locale_name($MASTER_LANGUAGE)." version</a>" ." of this module</li>\n"; echo "<li>If you want to translate this module you should check the $resfile\n"; echo "directory in the Wine source tree and make it include a new language file for\n"; @@ -91,7 +91,7 @@ foreach ($msgs as $value) $value = preg_replace("/@RES$([^:$]+):([^:\)]+)\)/", get_resource_name($m[1], $m[2]), $value); if (is_dumpable_type($m[1]) && (strpos($value, "Missing: ") === 0)) $value .= " (see ".gen_resource_a($MASTER_LANGUAGE, $resfile, $m[1], $m[2]) - .$MASTER_LANGUAGE_NAME." resource</a>)"; + .get_locale_name($MASTER_LANGUAGE)." resource</a>)"; } } diff --git a/transl/php/resource.php b/transl/php/resource.php index 68a9e55..4f51879 100644 --- a/transl/php/resource.php +++ b/transl/php/resource.php @@ -72,7 +72,7 @@ if (!$compare) { echo "<tr class=\"subheader\"><td colspan=\"3\" style=\"text-align: right\">"; echo "<small>".gen_resource_a($lang, $resfile, $type, $id, TRUE); - echo "Compare with ".$MASTER_LANGUAGE_NAME." >></a></small>"; + echo "Compare with ".get_locale_name($MASTER_LANGUAGE)." >></a></small>"; echo "</td></tr>"; } } @@ -80,7 +80,7 @@ else { echo "<tr class=\"subheader\"><td colspan=\"5\" style=\"text-align: right\">"; echo "<small>".gen_resource_a($lang, $resfile, $type, $id, FALSE); - echo "<< Hide compare with ".$MASTER_LANGUAGE_NAME."</a></small>"; + echo "<< Hide compare with ".get_locale_name($MASTER_LANGUAGE)."</a></small>"; echo "</td></tr>"; echo "<tr class=\"subheader\"><td>id</td><td> </td><td>".get_lang_name($lang)."</td><td> </td><td>".get_lang_name($MASTER_LANGUAGE)."</td></tr>";

1 0

Paul Vriens : transl: Remove an unused variable.
by Alexandre Julliard 23 Jul '09

23 Jul '09

Module: tools Branch: master Commit: ef2efe8ff8ec85309ec8294f72eae51ead114e6a URL: http://source.winehq.org/git/tools.git/?a=commit;h=ef2efe8ff8ec85309ec8294f… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Jul 23 09:03:49 2009 +0200 transl: Remove an unused variable. --- transl/php/lib.php | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/transl/php/lib.php b/transl/php/lib.php index 4255905..bfaed8d 100644 --- a/transl/php/lib.php +++ b/transl/php/lib.php @@ -1,7 +1,6 @@ <?php $MASTER_LANGUAGE = "009:01"; -$MASTER_LANGUAGE_BINID = 1033; $MASTER_LANGUAGE_NAME = "English (US)"; $WINE_WIKI_TRANSLATIONS = "<a href=\"redirect.php?url=http://wiki.winehq.org/Translating\">http://wiki.winehq.org/Translating</a>";

1 0

Alexander Nicolaysen Sørnes : Move votes when merging versions
by Alexander Nicolaysen Sørnes 23 Jul '09

23 Jul '09

Module: appdb Branch: master Commit: f95f3d533a78198a5ef058bddfd17b2a9a12efb1 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=f95f3d533a78198a5ef058bd… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Jul 23 16:25:36 2009 +0200 Move votes when merging versions --- include/version.php | 3 ++ include/vote.php | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 0 deletions(-) diff --git a/include/version.php b/include/version.php index 94b5071..064d890 100644 --- a/include/version.php +++ b/include/version.php @@ -1860,6 +1860,9 @@ class version { $aChildren[] = $oDownload; } + /* Get votes, include deleted ones */ + $aChildren += vote::getVotesForVersion($this->iVersionId); + return $aChildren; } diff --git a/include/vote.php b/include/vote.php index c19874f..520beca 100644 --- a/include/vote.php +++ b/include/vote.php @@ -70,6 +70,62 @@ class vote return TRUE; } + + public function getVotesForVersion($iVersionId) + { + $aRet = array(); + $hResult = query_parameters("SELECT * FROM appVotes WHERE versionId = '?'", + $iVersionId); + + if(!$hResult) + return $aRet; + + while($oRow = mysql_fetch_object($hResult)) + $aRet[] = new vote(null, $oRow); + + return $aRet; + } + + public function objectGetId() + { + return $this->iVoteId; + } + + public function objectGetSubmitterId() + { + return $this->iUserId; + } + + public function objectGetParent($sClass = '') + { + return new version($this->iVersionId); + } + + public function objectSetParent($iNewId, $sClass = '') + { + $this->iVersionId = $iNewId; + } + + public function canEdit() + { + if($_SESSION['current']->iUserId == $this->iUserId) + return true; + + $oVersion = new version($this->iVersionId); + + return $oVersion->canEdit(); + } + + function objectGetMail($sAction, $bMailSubmitter, $bParentAction) + { + return array(null, null, null); /* No mail */ + } + + public static function objectGetMailOptions($sAction, $bMailSubmitter, + $bParentAction) + { + return new mailOptions(); + } } class voteManager

1 0