<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[23974] trunk/WebKitTools</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/23974">23974</a></dd>
<dt>Author</dt> <dd>aroben</dd>
<dt>Date</dt> <dd>2007-07-03 17:58:41 -0700 (Tue, 03 Jul 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixed update-webkit-localizable-strings to work with new extract-localizable-strings
Got rid of extract-webkit-localizable-strings because it was trying to
do update-webkit-localizable-strings' job.
Rubberstamped by Darin.
* Scripts/extract-webkit-localizable-strings: Removed.
* Scripts/update-webkit-localizable-strings: Renamed from
extract-localizable-strings.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebKitToolsChangeLog">trunk/WebKitTools/ChangeLog</a></li>
<li><a href="#trunkWebKitToolsScriptsupdatewebkitlocalizablestrings">trunk/WebKitTools/Scripts/update-webkit-localizable-strings</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkWebKitToolsScriptsextractwebkitlocalizablestrings">trunk/WebKitTools/Scripts/extract-webkit-localizable-strings</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebKitToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/ChangeLog (23973 => 23974)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/ChangeLog 2007-07-04 00:56:17 UTC (rev 23973)
+++ trunk/WebKitTools/ChangeLog 2007-07-04 00:58:41 UTC (rev 23974)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2007-07-03 Adam Roben <aroben@apple.com>
</span><span class="cx">
</span><ins>+ Fixed update-webkit-localizable-strings to work with new extract-localizable-strings
+
+ Got rid of extract-webkit-localizable-strings because it was trying to
+ do update-webkit-localizable-strings' job.
+
+ Rubberstamped by Darin.
+
+ * Scripts/extract-webkit-localizable-strings: Removed.
+ * Scripts/update-webkit-localizable-strings: Renamed from
+ extract-localizable-strings.
+
+2007-07-03 Adam Roben <aroben@apple.com>
+
</ins><span class="cx"> Modify scripts to keep Mac/Windows localized strings in sync
</span><span class="cx">
</span><span class="cx"> extract-webkit-localizable-strings now handles extracting strings from
</span></span></pre></div>
<a id="trunkWebKitToolsScriptsextractwebkitlocalizablestrings"></a>
<div class="delfile"><h4>Deleted: trunk/WebKitTools/Scripts/extract-webkit-localizable-strings (23973 => 23974)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/Scripts/extract-webkit-localizable-strings 2007-07-04 00:56:17 UTC (rev 23973)
+++ trunk/WebKitTools/Scripts/extract-webkit-localizable-strings 2007-07-04 00:58:41 UTC (rev 23974)
</span><span class="lines">@@ -1,44 +0,0 @@
</span><del>-#!/usr/bin/perl -w
-
-# Copyright (C) 2007 Apple Inc. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-# 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
-# its contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
-# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-use strict;
-use warnings;
-
-use File::Basename;
-use FindBin;
-use lib $FindBin::Bin;
-use webkitdirs;
-
-my @directoriesToScan = ("WebKit", "WebKit/win");
-my $exceptionsFile = "WebKit/StringsNotToBeLocalized.txt";
-
-@ARGV == 0 or die "Usage: " . basename($0) . "\n";
-
-chdirWebKit();
-
-exec "extract-localizable-strings", $exceptionsFile, @directoriesToScan;
</del></span></pre></div>
<a id="trunkWebKitToolsScriptsupdatewebkitlocalizablestrings"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/Scripts/update-webkit-localizable-strings (23973 => 23974)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/Scripts/update-webkit-localizable-strings 2007-07-04 00:56:17 UTC (rev 23973)
+++ trunk/WebKitTools/Scripts/update-webkit-localizable-strings 2007-07-04 00:58:41 UTC (rev 23974)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> #!/usr/bin/perl -w
</span><span class="cx">
</span><del>-# Copyright (C) 2006 Apple Computer, Inc. All rights reserved.
</del><ins>+# Copyright (C) 2006, 2007 Apple Inc. All rights reserved.
</ins><span class="cx"> #
</span><span class="cx"> # Redistribution and use in source and binary forms, with or without
</span><span class="cx"> # modification, are permitted provided that the following conditions
</span><span class="lines">@@ -26,14 +26,20 @@
</span><span class="cx"> # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
</span><span class="cx"> # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx">
</span><del>-# Script to update localizable strings for WebKit Open Source Project.
</del><ins>+use strict;
+use warnings;
</ins><span class="cx">
</span><del>-use strict;
</del><ins>+use File::Basename;
</ins><span class="cx"> use FindBin;
</span><span class="cx"> use lib $FindBin::Bin;
</span><span class="cx"> use webkitdirs;
</span><span class="cx">
</span><ins>+my @directoriesToScan = ("WebKit", "WebKit/win");
+my $exceptionsFile = "WebKit/StringsNotToBeLocalized.txt";
+
+@ARGV == 0 or die "Usage: " . basename($0) . "\n";
+
</ins><span class="cx"> chdirWebKit();
</span><del>-chdir "WebKit" or die;
-system "sort -u English.lproj/StringsNotToBeLocalized.txt -o English.lproj/StringsNotToBeLocalized.txt";
-system "../WebKitTools/Scripts/extract-localizable-strings";
</del><ins>+
+system "sort -u $exceptionsFile -o $exceptionsFile";
+exec "extract-localizable-strings", $exceptionsFile, @directoriesToScan;
</ins></span></pre>
</div>
</div>
</body>
</html>