wine-commits June 2009

wine-commits@winehq.org

5 participants
1115 discussions

Mikolaj Zalewski : add support for customizing the title
by Alexandre Julliard 19 Jun '09

19 Jun '09

Module: tools Branch: master Commit: 2a408d8a29ff7fdae4f7a0fa9fba3cfecb31f859 URL: http://source.winehq.org/git/tools.git/?a=commit;h=2a408d8a29ff7fdae4f7a0fa… Author: Mikolaj Zalewski <mikolajz(a)tygrys.dom> Date: Thu Jun 19 19:13:09 2008 +0200 add support for customizing the title --- php/config.php | 2 ++ php/index.php | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/php/config.php b/php/config.php index 0dff152..bb6c73b 100644 --- a/php/config.php +++ b/php/config.php @@ -1,3 +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 diff --git a/php/index.php b/php/index.php index b8f0f7d..561a089 100644 --- a/php/index.php +++ b/php/index.php @@ -22,9 +22,11 @@ while ($line = fgets($summary, 1024)) <html> <head> <link rel="stylesheet" href="style.css" type="text/css"/> - <title>Wine translation statistics</title> + <title>Wine translation statistics <?php echo $TITLE_APPENDIX ?></title> </head> -<h1>Wine translation statistics</h1> +<h1>Wine translation statistics <?php echo $TITLE_APPENDIX ?></h1> + +<?php echo $TITLE_DESCR ?> <p>This page shows the state of the translations of <a href="http://www.winehq.org/">Wine</a>. Note that some resources marked as translated may be in fact in English - sometimes developers

1 0

Mikolaj Zalewski : there may be no space between RC_SRCS and =
by Alexandre Julliard 19 Jun '09

19 Jun '09

Module: tools Branch: master Commit: feb0dc10fb095d48d231542682217d1c1bf83d0f URL: http://source.winehq.org/git/tools.git/?a=commit;h=feb0dc10fb095d48d2315426… Author: Mikolaj Zalewski <mikolajz(a)tygrys.dom> Date: Thu Jun 5 23:05:48 2008 +0200 there may be no space between RC_SRCS and = --- scripts/checkmakefile.pl | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/checkmakefile.pl b/scripts/checkmakefile.pl index cc5064f..c13c31f 100755 --- a/scripts/checkmakefile.pl +++ b/scripts/checkmakefile.pl @@ -113,7 +113,7 @@ $ARGV[0] =~ m,^(.*/)[^/]*$,; $path = $1; while (<MAKEFILE>) { - if (m/^RC_SRCS +=/) + if (m/^RC_SRCS *=/) { while (m/\\$/) { @@ -121,7 +121,7 @@ while (<MAKEFILE>) chop; $_ .= <MAKEFILE>; } - m/^RC_SRCS += (.*)$/; + m/^RC_SRCS *=(.*)$/; @file = split(/ /, $1); foreach (@file) {

1 0

Mikolaj Zalewski : Swedish is using SUBLANG_NEUTRAL
by Alexandre Julliard 19 Jun '09

19 Jun '09

Module: tools Branch: master Commit: b87b7c3e91243fe2a029a1ab1fa9ccc22b5e09c0 URL: http://source.winehq.org/git/tools.git/?a=commit;h=b87b7c3e91243fe2a029a1ab… Author: Mikolaj Zalewski <mikolajz(a)tygrys.dom> Date: Thu Jun 5 23:03:46 2008 +0200 Swedish is using SUBLANG_NEUTRAL --- scripts/conf/{01d:01 => 01d:00} | 0 1 files changed, 0 insertions(+), 0 deletions(-) diff --git a/scripts/conf/01d:01 b/scripts/conf/01d:00 similarity index 100% rename from scripts/conf/01d:01 rename to scripts/conf/01d:00

1 0

Mikolaj Zalewski : spelling fixes
by Alexandre Julliard 19 Jun '09

19 Jun '09

Module: tools Branch: master Commit: 7d1d9da7cc0af47a21d3abb352e9109cf44d0592 URL: http://source.winehq.org/git/tools.git/?a=commit;h=7d1d9da7cc0af47a21d3abb3… Author: Mikolaj Zalewski <mikolajz(a)tygrys.dom> Date: Tue May 6 21:26:24 2008 +0200 spelling fixes --- php/lang.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/php/lang.php b/php/lang.php index ef92883..167cf2f 100644 --- a/php/lang.php +++ b/php/lang.php @@ -69,10 +69,10 @@ function dump_table($table) <?php warn_if_lang_hidden($lang) ?> -<h2>Partialy translanted files</h2> +<h2>Partially translated files</h2> <?php dump_table($partial) ?> -<h2>Files not translanted</h2> +<h2>Files not translated</h2> <?php dump_table($notransl) ?> <h2>Locales data</h2>

1 0

Mikolaj Zalewski : fix Romansh language name, add Romansh locale name
by Alexandre Julliard 19 Jun '09

19 Jun '09

Module: tools Branch: master Commit: c5be021b9231b8323bc4aaeb7e7cfe7a48a9b4b4 URL: http://source.winehq.org/git/tools.git/?a=commit;h=c5be021b9231b8323bc4aaeb… Author: Mikolaj Zalewski <mikolajz(a)tygrys.dom> Date: Sat Apr 5 12:10:14 2008 +0200 fix Romansh language name, add Romansh locale name --- php/devel/dump-locales.php | 2 +- php/dump_locales.php | 1 + scripts/conf/017:01 | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/php/devel/dump-locales.php b/php/devel/dump-locales.php index e88d7fb..36a915a 100644 --- a/php/devel/dump-locales.php +++ b/php/devel/dump-locales.php @@ -15,7 +15,7 @@ function res_enum($header, $f) return FALSE; # echo "Found resource for locale ".$header["language"]."<br/>\n"; $data = fread($f, $header["resSize"]); - $str = new StringTable($header, $data); + $str = new StringTable($header, $data, 0); $langid = sprintf("%03x:%02x", $header["language"] & 0x3ff, $header["language"] >> 10); $LOCALE_NAMES[$langid] = $str->getString(2); } diff --git a/php/dump_locales.php b/php/dump_locales.php index 3a622a0..69963c4 100644 --- a/php/dump_locales.php +++ b/php/dump_locales.php @@ -91,6 +91,7 @@ $LOCALE_NAMES["014:02"] = "Norwegian (Nynorsk)"; $LOCALE_NAMES["015:01"] = "Polish"; $LOCALE_NAMES["016:01"] = "Portuguese (Brazil)"; $LOCALE_NAMES["016:02"] = "Portuguese (Portugal)"; +$LOCALE_NAMES["017:01"] = "Romansh (Switzerland)"; $LOCALE_NAMES["018:01"] = "Romanian"; $LOCALE_NAMES["018:00"] = $LOCALE_NAMES["018:01"]; # ignore sublangs $LOCALE_NAMES["019:01"] = "Russian"; diff --git a/scripts/conf/017:01 b/scripts/conf/017:01 index 8a7fc8d..9d0ddbd 100644 --- a/scripts/conf/017:01 +++ b/scripts/conf/017:01 @@ -1 +1 @@ -Romanch (Switzerland) \ No newline at end of file +Romansh (Switzerland) \ No newline at end of file

1 0

Mikolaj Zalewski : fix DIALOGEX id
by Alexandre Julliard 19 Jun '09

19 Jun '09

Module: tools Branch: master Commit: 8575388b77b1c89208cf8f63439fd1a7420c19da URL: http://source.winehq.org/git/tools.git/?a=commit;h=8575388b77b1c89208cf8f63… Author: Mikolaj Zalewski <mikolajz(a)tygrys.dom> Date: Sat Apr 5 12:09:58 2008 +0200 fix DIALOGEX id --- php/lib.php | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/php/lib.php b/php/lib.php index ca463d8..cfca0fb 100644 --- a/php/lib.php +++ b/php/lib.php @@ -133,7 +133,8 @@ function get_resource_name($type, $name) $types[14] = "GROUP_ICON"; $types[16] = "VERSION"; $types[260] = "MENUEX"; - $types[262] = "DIALOGEX"; + $types[261] = "DIALOGEX"; + $types[262] = "USER"; if (is_numeric($name)) $pname = "#".$name;

1 0

Mikolaj Zalewski : add Romansh
by Alexandre Julliard 19 Jun '09

19 Jun '09

Module: tools Branch: master Commit: 434f29c3e3b06d0d6b053760ef7d52c6fc1a1970 URL: http://source.winehq.org/git/tools.git/?a=commit;h=434f29c3e3b06d0d6b053760… Author: Mikolaj Zalewski <mikolajz(a)tygrys.dom> Date: Fri Mar 28 20:20:26 2008 +0100 add Romansh --- scripts/conf/017:01 | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/scripts/conf/017:01 b/scripts/conf/017:01 new file mode 100644 index 0000000..8a7fc8d --- /dev/null +++ b/scripts/conf/017:01 @@ -0,0 +1 @@ +Romanch (Switzerland) \ No newline at end of file

1 0

Mikolaj Zalewski : add the link to the Wine wiki
by Alexandre Julliard 19 Jun '09

19 Jun '09

Module: tools Branch: master Commit: 571f3be2395890ea1d35392683b3d332866002f5 URL: http://source.winehq.org/git/tools.git/?a=commit;h=571f3be2395890ea1d353926… Author: Mikolaj Zalewski <mikolajz(a)tygrys.dom> Date: Wed Mar 19 23:25:30 2008 +0100 add the link to the Wine wiki --- php/lib.php | 2 +- php/redirect.php | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/php/lib.php b/php/lib.php index 74d3807..ca463d8 100644 --- a/php/lib.php +++ b/php/lib.php @@ -4,7 +4,7 @@ $MASTER_LANGUAGE = "009:01"; $MASTER_LANGUAGE_BINID = 1033; $MASTER_LANGUAGE_NAME = "English (US)"; -$WINE_WIKI_TRANSLATIONS = "<a href=\"TODO\">[TODO: Wiki translations page]</a>"; +$WINE_WIKI_TRANSLATIONS = "<a href=\"redirect.php?url=http://wiki.winehq.org/Translating\">http://wiki.winehq.org/Translating</a>"; function validate_lang($id) { diff --git a/php/redirect.php b/php/redirect.php new file mode 100644 index 0000000..1d0d2ca --- /dev/null +++ b/php/redirect.php @@ -0,0 +1,9 @@ +<?php + +$url = $_REQUEST['url']; + +if (strpos($url, "http://wiki.winehq.org/") === 0) + header("Location: $url"); +else + die("Invalid address"); +?>

1 0

Mikolaj Zalewski : small bugfixes
by Alexandre Julliard 19 Jun '09

19 Jun '09

Module: tools Branch: master Commit: 9032ef91ac26ca47ac23e6da786629b5df42af03 URL: http://source.winehq.org/git/tools.git/?a=commit;h=9032ef91ac26ca47ac23e6da… Author: Mikolaj Zalewski <mikolajz(a)tygrys.dom> Date: Wed Mar 19 23:14:33 2008 +0100 small bugfixes --- php/lib_res.php | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/php/lib_res.php b/php/lib_res.php index 92fb274..441d27b 100644 --- a/php/lib_res.php +++ b/php/lib_res.php @@ -273,7 +273,7 @@ class StringTable extends Resource $extra = " style=\"background-color: #ffb8d0\""; } - echo "<tr$extra><td valign=\"top\">".(($this->table_id-1)*16+$i)."</td><td></td>"; + echo "<tr$extra><td valign=\"top\">".(($this->table_id-1)*16+$i)."</td><td> </td>"; echo "<td>"; dump_unicode_or_empty($uni_str); @@ -392,7 +392,7 @@ class MenuResource extends Resource } /* backtrack (produces results in reverse order) */ - $out = array_fill(0, $end, 3); + $out = ($end > 0 ? array_fill(0, $end, 3) : array()); $i = count($this->items) - $start - $end; $j = count($res2->items) - $start - $end; while ($i > 0 || $j > 0) { @@ -417,7 +417,8 @@ class MenuResource extends Resource if ($step & 2) $j--; } - $out += array_fill(count($out), $start, 3); + if ($start > 0) + $out += array_fill(count($out), $start, 3); return array_reverse($out); } @@ -491,8 +492,8 @@ class MenuResource extends Resource $extra = " style=\"background-color: #ffb8d0\""; } - $id = ($show[$i] & 1 ? $this->items[$pos]["id"] : $master_res->items[$pos]["id"]); - echo "<tr$extra><td valign=\"top\">$id</td><td></td>"; + $id = ($show[$i] & 1 ? $this->items[$pos]["id"] : $master_res->items[$master_pos]["id"]); + echo "<tr$extra><td valign=\"top\">$id</td><td> </td>"; echo "<td>"; if ($show[$i] & 1)

1 0

Mikolaj Zalewski : add resource file directory to include directories
by Alexandre Julliard 19 Jun '09

19 Jun '09

Module: tools Branch: master Commit: 78fa6773a4b1f1df57ce1da0fb7a0b9e1bd92744 URL: http://source.winehq.org/git/tools.git/?a=commit;h=78fa6773a4b1f1df57ce1da0… Author: Mikolaj Zalewski <mikolajz(a)tygrys.dom> Date: Wed Mar 19 14:20:05 2008 +0100 add resource file directory to include directories --- scripts/checkmakefile.pl | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/checkmakefile.pl b/scripts/checkmakefile.pl index 6119eca..cc5064f 100755 --- a/scripts/checkmakefile.pl +++ b/scripts/checkmakefile.pl @@ -4,6 +4,7 @@ # on resource files and call ver.pl to parse the results use Cwd; +use File::Basename; sub log_string { @@ -32,7 +33,8 @@ sub mycheck log_string("*** $name [$defs]"); - $ret = system("$wrc -I$winedir/include -I$winedir/dlls/user32 --verify-translation $defs $name $workdir/tmp.res 2>>$workdir/run.log >$workdir/ver.txt"); + my($respath) = dirname($name); + $ret = system("$wrc -I$respath -I$winedir/include -I$winedir/dlls/user32 --verify-translation $defs $name $workdir/tmp.res 2>>$workdir/run.log >$workdir/ver.txt"); if ($ret == 0) { $name =~ s,$winedir,,; @@ -46,7 +48,7 @@ sub mycheck $norm_fn= $name; $norm_fn =~ s/\.rc$//; $norm_fn =~ s/[^a-zA-Z0-9]/-/g; - $ret = system("$wrc -I$winedir/include -I$winedir/dlls/user32 $defs $winedir$name $workdir/dumps/res/$norm_fn.res 2>>$workdir/run.log >/dev/null"); + $ret = system("$wrc -I$respath -I$winedir/include -I$winedir/dlls/user32 $defs $winedir$name $workdir/dumps/res/$norm_fn.res 2>>$workdir/run.log >/dev/null"); if ($ret != 0) { print "!!!!!!! 2nd pass return value: ".$ret."\n";

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2009