<html>
<head>
<style><!--
body {background-color:#ffffff;}
.file {border:1px solid #eeeeee;margin-top:1em;margin-bottom:1em;}
.pathname {font-family:monospace; float:right;}
.fileheader {margin-bottom:.5em;}
.diff {margin:0;}
.tasklist {padding:4px;border:1px dashed #000000;margin-top:1em;}
.tasklist ul {margin-top:0;margin-bottom:0;}
tr.alt {background-color:#eeeeee}
#added {background-color:#ddffdd;}
#addedchars {background-color:#99ff99;font-weight:bolder;}
tr.alt #added {background-color:#ccf7cc;}
#removed {background-color:#ffdddd;}
#removedchars {background-color:#ff9999;font-weight:bolder;}
tr.alt #removed {background-color:#f7cccc;}
#info {color:#888888;}
#context {background-color:#eeeeee;}
td {padding-left:.3em;padding-right:.3em;}
tr.head {border-bottom-width:1px;border-bottom-style:solid;}
tr.head td {padding:0;padding-top:.2em;}
.task {background-color:#ffff00;}
.comment {padding:4px;border:1px dashed #000000;background-color:#ffffdd}
.error {color:red;}
hr {border-width:0px;height:2px;background:black;}
--></style>
</head>
<body>
<table cellspacing="0" cellpadding="0" border="0" rules="cols">
<tr class="head"><td colspan="4">Commit in <b><tt>trunk/as2api</tt></b><span id="info"> on MAIN</span></td></tr>
<tr><td><tt>output/html/<a href="#file1">core_pages.rb</a></tt></td><td align="right" id="added">+38</td><td align="right" id="removed">-36</td><td nowrap="nowrap" align="center">275 -> 276</td></tr>
<tr class="alt"><td><tt> /<a href="#file2">default_frameset.rb</a></tt></td><td align="right" id="added">+12</td><td align="right" id="removed">-11</td><td nowrap="nowrap" align="center">275 -> 276</td></tr>
<tr><td><tt> /<a href="#file3">diff.rb</a></tt></td><td align="right" id="added">+33</td><td align="right" id="removed">-32</td><td nowrap="nowrap" align="center">275 -> 276</td></tr>
<tr class="alt"><td><tt> /<a href="#file4">driver.rb</a></tt></td><td align="right" id="added">+6</td><td align="right" id="removed">-5</td><td nowrap="nowrap" align="center">275 -> 276</td></tr>
<tr><td><tt> /<a href="#file5">html_framework.rb</a></tt></td><td align="right" id="added">+42</td><td align="right" id="removed">-9</td><td nowrap="nowrap" align="center">275 -> 276</td></tr>
<tr class="alt"><td><tt> /<a href="#file6">index.rb</a></tt></td><td align="right" id="added">+9</td><td align="right" id="removed">-6</td><td nowrap="nowrap" align="center">275 -> 276</td></tr>
<tr><td><tt> /<a href="#file7">sources.rb</a></tt></td><td align="right" id="added">+2</td><td align="right" id="removed">-2</td><td nowrap="nowrap" align="center">275 -> 276</td></tr>
<tr class="alt"><td><tt>ui/<a href="#file8">cli.rb</a></tt></td><td align="right" id="added">+25</td><td align="right" id="removed">-11</td><td nowrap="nowrap" align="center">275 -> 276</td></tr>
<tr><td></td><td align="right" id="added">+167</td><td align="right" id="removed">-112</td><td></td></tr>
</table>
<small id="info">8 modified files</small><br />
<pre class="comment">
Initial attempt at i18n
</pre>
<hr /><a name="file1" /><div class="file">
<span class="pathname">trunk/as2api/output/html</span><br />
<div class="fileheader"><big><b>core_pages.rb</b></big> <small id="info">275 -> 276</small></div>
<pre class="diff"><small id="info">--- trunk/as2api/output/html/core_pages.rb 2006-02-09 17:42:30 UTC (rev 275)
+++ trunk/as2api/output/html/core_pages.rb 2006-02-24 00:16:11 UTC (rev 276)
@@ -11,6 +11,8 @@
</small></pre><pre class="diff" id="context"> require 'output/utils'
require 'rexml/document'
</pre><pre class="diff" id="added">+bindtextdomain("as2api")
+
</pre><pre class="diff" id="context"> class OverviewNavLinkBuilder < NavLinkBuilder
def href_on(page); page.base_path("overview-summary.html"); end
</pre><pre class="diff"><small id="info">@@ -18,9 +20,9 @@
</small></pre><pre class="diff" id="context">
def title_on(page)
if @conf.title
</pre><pre class="diff" id="removed">- "Overview of #{@conf.title}"
</pre><pre class="diff" id="added">+ _("Overview of %s") % @conf.title
</pre><pre class="diff" id="context"> else
</pre><pre class="diff" id="removed">- "Overview of API"
</pre><pre class="diff" id="added">+ _("Overview of API")
</pre><pre class="diff" id="context"> end
end
end
</pre><pre class="diff"><small id="info">@@ -38,7 +40,7 @@
</small></pre><pre class="diff" id="context">
def title_on(page)
if page.aspackage
</pre><pre class="diff" id="removed">- "Overview of package #{page.package_display_name_for(page.aspackage)}"
</pre><pre class="diff" id="added">+ _("Overview of package %s") % page.package_display_name_for(page.aspackage)
</pre><pre class="diff" id="context"> else
nil
end
</pre><pre class="diff"><small id="info">@@ -59,7 +61,7 @@
</small></pre><pre class="diff" id="context">
def title_on(page)
if page.astype
</pre><pre class="diff" id="removed">- "Detail of #{page.astype.qualified_name} API"
</pre><pre class="diff" id="added">+ _("Detail of %s API") % page.astype.qualified_name
</pre><pre class="diff" id="context"> else
nil
end
</pre><pre class="diff"><small id="info">@@ -91,7 +93,7 @@
</small></pre><pre class="diff" id="context">
if @type.implements_interfaces?
html_div("class"=>"interfaces") do
</pre><pre class="diff" id="removed">- html_h2("Implemented Interfaces")
</pre><pre class="diff" id="added">+ html_h2(_("Implemented Interfaces"))
</pre><pre class="diff" id="context"> @type.each_interface do |interface|
# TODO: need to resolve interface name, make links
html_code do
</pre><pre class="diff"><small id="info">@@ -105,12 +107,12 @@
</small></pre><pre class="diff" id="context"> if @type.comment
comment_data = @type.comment
</pre><pre class="diff" id="removed">- html_h2("Description")
</pre><pre class="diff" id="added">+ html_h2(_("Description"))
</pre><pre class="diff" id="context"> html_p do
output_doccomment_blocktag(comment_data[0])
end
if comment_data.has_seealso?
</pre><pre class="diff" id="removed">- html_h4("See Also")
</pre><pre class="diff" id="added">+ html_h4(_("See Also"))
</pre><pre class="diff" id="context"> html_ul("class"=>"extra_info") do
comment_data.each_seealso do |see_comment|
html_li do
</pre><pre class="diff"><small id="info">@@ -152,7 +154,7 @@
</small></pre><pre class="diff" id="context"> end
def link_top
</pre><pre class="diff" id="removed">- yield <span id="removedchars">"Overview"</span>, base_path("overview-summary.html")
</pre><pre class="diff" id="added">+ yield <span id="addedchars">_("Overview")</span>, base_path("overview-summary.html")
</pre><pre class="diff" id="context"> end
def link_up
</pre><pre class="diff"><small id="info">@@ -161,27 +163,27 @@
</small></pre><pre class="diff" id="context">
def link_prev
if @prev_type
</pre><pre class="diff" id="removed">- kind = @prev_type.is_a?(ASInterface) ? "Interface" : "Class"
</pre><pre class="diff" id="added">+ kind = @prev_type.is_a?(ASInterface) ? _("Interface") : _("Class")
</pre><pre class="diff" id="context"> yield "#{kind} #{@prev_type.qualified_name}", link_for_type(@prev_type)
end
end
def link_next
if @next_type
</pre><pre class="diff" id="removed">- kind = @next_type.is_a?(ASInterface) ? "Interface" : "Class"
</pre><pre class="diff" id="added">+ kind = @next_type.is_a?(ASInterface) ? _("Interface") : _("Class")
</pre><pre class="diff" id="context"> yield "#{kind} #{@next_type.qualified_name}", link_for_type(@next_type)
end
end
def field_index_list(type)
html_div("class"=>"field_index") do
</pre><pre class="diff" id="removed">- html_h2("Field Index")
</pre><pre class="diff" id="added">+ html_h2(_("Field Index"))
</pre><pre class="diff" id="context"> list_fields(type)
if type.has_ancestor?
type.each_ancestor do |type|
if has_documentable_fields?(type)
html_h4 do
</pre><pre class="diff" id="removed">- pcdata("Inherited from ")
</pre><pre class="diff" id="added">+ pcdata(_("Inherited from "))
</pre><pre class="diff" id="context"> link_type(type)
end
html_div("class"=>"extra_info") do
</pre><pre class="diff"><small id="info">@@ -215,7 +217,7 @@
</small></pre><pre class="diff" id="context">
def method_index_list(type)
html_div("class"=>"method_index") do
</pre><pre class="diff" id="removed">- html_h2("Method Index")
</pre><pre class="diff" id="added">+ html_h2(_("Method Index"))
</pre><pre class="diff" id="context"> if type.constructor? && document_member?(type.constructor)
html_div do
html_code do
</pre><pre class="diff"><small id="info">@@ -230,7 +232,7 @@
</small></pre><pre class="diff" id="context"> type.each_ancestor do |type|
if has_documentable_methods?(type, known_method_names)
html_h4 do
</pre><pre class="diff" id="removed">- pcdata("Inherited from ")
</pre><pre class="diff" id="added">+ pcdata(_("Inherited from "))
</pre><pre class="diff" id="context"> link_type(type)
end
html_div("class"=>"extra_info") do
</pre><pre class="diff"><small id="info">@@ -264,14 +266,14 @@
</small></pre><pre class="diff" id="context">
def constructor_detail(type)
html_div("class"=>"constructor_detail_list") do
</pre><pre class="diff" id="removed">- html_h2("Constructor Detail")
</pre><pre class="diff" id="added">+ html_h2(_("Constructor Detail"))
</pre><pre class="diff" id="context"> document_method(type.constructor)
end
end
def field_detail_list(type)
html_div("class"=>"field_detail_list") do
</pre><pre class="diff" id="removed">- html_h2("Field Detail")
</pre><pre class="diff" id="added">+ html_h2(_("Field Detail"))
</pre><pre class="diff" id="context"> type.each_field do |field|
document_field(field) if document_member?(field)
end
</pre><pre class="diff"><small id="info">@@ -299,7 +301,7 @@
</small></pre><pre class="diff" id="context">
def method_detail_list(type)
html_div("class"=>"method_detail_list") do
</pre><pre class="diff" id="removed">- html_h2("Method Detail")
</pre><pre class="diff" id="added">+ html_h2(_("Method Detail"))
</pre><pre class="diff" id="context"> count = 0
type.each_method do |method|
next unless document_member?(method)
</pre><pre class="diff"><small id="info">@@ -345,7 +347,7 @@
</small></pre><pre class="diff" id="context"> unless documented_method.nil?
comment_data = documented_method.comment
html_p("class"=>"inherited_docs") do
</pre><pre class="diff" id="removed">- pcdata("Description copied from ")
</pre><pre class="diff" id="added">+ pcdata(_("Description copied from "))
</pre><pre class="diff" id="context"> link_type(documented_method.containing_type)
end
html_p do
</pre><pre class="diff"><small id="info">@@ -396,7 +398,7 @@
</small></pre><pre class="diff" id="context"> end
def document_parameters(arguments, comment_data)
</pre><pre class="diff" id="removed">- html_h4("Parameters")
</pre><pre class="diff" id="added">+ html_h4(_("Parameters"))
</pre><pre class="diff" id="context"> html_table("class"=>"arguments extra_info", "summary"=>"") do
arguments.each do |arg|
desc = comment_data.find_param(arg.name)
</pre><pre class="diff"><small id="info">@@ -416,7 +418,7 @@
</small></pre><pre class="diff" id="context"> if vararg
html_tr do
html_td do
</pre><pre class="diff" id="removed">- html_code("...", {"title", "Variable length argument list"})
</pre><pre class="diff" id="added">+ html_code("...", {"title", _("Variable length argument list")})
</pre><pre class="diff" id="context"> end
html_td do
output_doccomment_blocktag(vararg)
</pre><pre class="diff"><small id="info">@@ -427,7 +429,7 @@
</small></pre><pre class="diff" id="context"> end
def document_return(comment_data)
</pre><pre class="diff" id="removed">- html_h4("Return")
</pre><pre class="diff" id="added">+ html_h4(_("Return"))
</pre><pre class="diff" id="context"> return_comment = comment_data.find_return
html_p("class"=>"extra_info") do
output_doccomment_blocktag(return_comment)
</pre><pre class="diff"><small id="info">@@ -435,7 +437,7 @@
</small></pre><pre class="diff" id="context"> end
def document_exceptions(comment_data)
</pre><pre class="diff" id="removed">- html_h4("Throws")
</pre><pre class="diff" id="added">+ html_h4(_("Throws"))
</pre><pre class="diff" id="context"> html_table("class"=>"exceptions extra_info", "summary"=>"") do
comment_data.each_exception do |exception_comment|
html_tr do
</pre><pre class="diff"><small id="info">@@ -451,7 +453,7 @@
</small></pre><pre class="diff" id="context"> end
def document_seealso(comment_data)
</pre><pre class="diff" id="removed">- html_h4("See Also")
</pre><pre class="diff" id="added">+ html_h4(_("See Also"))
</pre><pre class="diff" id="context"> html_ul("class"=>"extra_info") do
comment_data.each_seealso do |see_comment|
html_li do
</pre><pre class="diff"><small id="info">@@ -462,7 +464,7 @@
</small></pre><pre class="diff" id="context"> end
def document_specified_by(method)
</pre><pre class="diff" id="removed">- html_h4("Specified By")
</pre><pre class="diff" id="added">+ html_h4(_("Specified By"))
</pre><pre class="diff" id="context"> html_p("class"=>"extra_info") do
link_method(method)
pcdata(" in ")
</pre><pre class="diff"><small id="info">@@ -471,7 +473,7 @@
</small></pre><pre class="diff" id="context"> end
def document_overridden(method)
</pre><pre class="diff" id="removed">- html_h4("Overrides")
</pre><pre class="diff" id="added">+ html_h4(_("Overrides"))
</pre><pre class="diff" id="context"> html_p("class"=>"extra_info") do
link_method(method)
pcdata(" in ")
</pre><pre class="diff"><small id="info">@@ -562,9 +564,9 @@
</small></pre><pre class="diff" id="context"> pcdata(" ")
html_em("class"=>"read_write_only") do
if field.read?
</pre><pre class="diff" id="removed">- pcdata("[Read Only]")
</pre><pre class="diff" id="added">+ pcdata(_("[Read Only]"))
</pre><pre class="diff" id="context"> else
</pre><pre class="diff" id="removed">- pcdata("[Write Only]")
</pre><pre class="diff" id="added">+ pcdata(_("[Write Only]"))
</pre><pre class="diff" id="context"> end
end
end
</pre><pre class="diff"><small id="info">@@ -579,7 +581,7 @@
</small></pre><pre class="diff" id="context"> dir = package_dir_for(package)
super(conf, "package-summary", dir)
@package = package
</pre><pre class="diff" id="removed">- @title = "#{package_description_for(@package)} API Documentation"
</pre><pre class="diff" id="added">+ @title = _("%s API Documentation") % package_description_for(@package)
</pre><pre class="diff" id="context"> @prev_package = nil
@next_package = nil
end
</pre><pre class="diff"><small id="info">@@ -592,7 +594,7 @@
</small></pre><pre class="diff" id="context"> unless interfaces.empty?
interfaces.sort!
html_table("class"=>"summary_list", "summary"=>"") do
</pre><pre class="diff" id="removed">- html_caption("Interface Summary")
</pre><pre class="diff" id="added">+ html_caption(_("Interface Summary"))
</pre><pre class="diff" id="context"> interfaces.each do |type|
html_tr do
</pre><pre class="diff"><small id="info">@@ -612,7 +614,7 @@
</small></pre><pre class="diff" id="context"> unless classes.empty?
classes.sort!
html_table("class"=>"summary_list", "summary"=>"") do
</pre><pre class="diff" id="removed">- html_caption("Class Summary")
</pre><pre class="diff" id="added">+ html_caption(_("Class Summary"))
</pre><pre class="diff" id="context"> classes.each do |type|
html_tr do
</pre><pre class="diff"><small id="info">@@ -637,7 +639,7 @@
</small></pre><pre class="diff" id="context"> end
def link_top
</pre><pre class="diff" id="removed">- yield <span id="removedchars">"Overview"</span>, base_path("overview-summary.html")
</pre><pre class="diff" id="added">+ yield <span id="addedchars">_("Overview")</span>, base_path("overview-summary.html")
</pre><pre class="diff" id="context"> end
def link_prev
if @prev_package
</pre><pre class="diff"><small id="info">@@ -653,7 +655,7 @@
</small></pre><pre class="diff" id="context"> def class_diagram
dir = File.join(@conf.output_dir, path_name)
if FileTest.exists?(File.join(dir, "package-classes.png"))
</pre><pre class="diff" id="removed">- html_h1("Class Inheritance Diagram")
</pre><pre class="diff" id="added">+ html_h1(_("Class Inheritance Diagram"))
</pre><pre class="diff" id="context"> html_div("class"=>"diagram") do
if FileTest.exists?(File.join(dir, "package-classes.cmapx"))
map = true
</pre><pre class="diff"><small id="info">@@ -673,7 +675,7 @@
</small></pre><pre class="diff" id="context"> def interface_diagram
dir = File.join(@conf.output_dir, path_name)
if FileTest.exists?(File.join(dir, "package-interfaces.png"))
</pre><pre class="diff" id="removed">- html_h1("Interface Inheritance Diagram")
</pre><pre class="diff" id="added">+ html_h1(_("Interface Inheritance Diagram"))
</pre><pre class="diff" id="context"> html_div("class"=>"diagram") do
if FileTest.exists?(File.join(dir, "package-interfaces.cmapx"))
map = true
</pre><pre class="diff"><small id="info">@@ -785,13 +787,13 @@
</small></pre><pre class="diff" id="context"> def initialize(conf, type_agregator)
super(conf, "overview-summary")
@type_agregator = type_agregator
</pre><pre class="diff" id="removed">- @title = "API Overview"
</pre><pre class="diff" id="added">+ @title = _("API Overview")
</pre><pre class="diff" id="context"> end
def generate_body_content
</pre><pre class="diff" id="removed">- html_h1("API Overview")
</pre><pre class="diff" id="added">+ html_h1(_("API Overview"))
</pre><pre class="diff" id="context"> html_table("class"=>"summary_list", "summary"=>"") do
</pre><pre class="diff" id="removed">- html_caption("Packages")
</pre><pre class="diff" id="added">+ html_caption(_("Packages"))
</pre><pre class="diff" id="context"> packages = @type_agregator.packages.sort
packages.each do |package|
html_tr do
</pre></div>
<hr /><a name="file2" /><div class="file">
<span class="pathname">trunk/as2api/output/html</span><br />
<div class="fileheader"><big><b>default_frameset.rb</b></big> <small id="info">275 -> 276</small></div>
<pre class="diff"><small id="info">--- trunk/as2api/output/html/default_frameset.rb 2006-02-09 17:42:30 UTC (rev 275)
+++ trunk/as2api/output/html/default_frameset.rb 2006-02-24 00:16:11 UTC (rev 276)
@@ -9,6 +9,7 @@
</small></pre><pre class="diff" id="context">
require 'output/html/html_framework'
</pre><pre class="diff" id="added">+bindtextdomain("as2api")
</pre><pre class="diff" id="context">
class PackageFramePage < Page
</pre><pre class="diff"><small id="info">@@ -16,7 +17,7 @@
</small></pre><pre class="diff" id="context"> dir = package_dir_for(package)
super("package-frame", dir)
@package = package
</pre><pre class="diff" id="removed">- @title = "#{package_description_for(@package)} API Naviation"
</pre><pre class="diff" id="added">+ @title = _("%s API Naviation") % package_description_for(@package)
</pre><pre class="diff" id="context"> @doctype_id = :transitional
end
</pre><pre class="diff"><small id="info">@@ -28,7 +29,7 @@
</small></pre><pre class="diff" id="context"> interfaces = @package.interfaces
unless interfaces.empty?
interfaces.sort!
</pre><pre class="diff" id="removed">- html_h3("Interfaces")
</pre><pre class="diff" id="added">+ html_h3(_("Interfaces"))
</pre><pre class="diff" id="context"> html_ul("class"=>"navigation_list") do
interfaces.each do |type|
</pre><pre class="diff"><small id="info">@@ -41,7 +42,7 @@
</small></pre><pre class="diff" id="context"> classes = @package.classes
unless classes.empty?
classes.sort!
</pre><pre class="diff" id="removed">- html_h3("Classes")
</pre><pre class="diff" id="added">+ html_h3(_("Classes"))
</pre><pre class="diff" id="context"> html_ul("class"=>"navigation_list") do
classes.each do |type|
</pre><pre class="diff"><small id="info">@@ -61,17 +62,17 @@
</small></pre><pre class="diff" id="context"> def initialize(type_agregator)
super("overview-frame")
@type_agregator = type_agregator
</pre><pre class="diff" id="removed">- @title = "API Overview"
</pre><pre class="diff" id="added">+ @title = _("API Overview")
</pre><pre class="diff" id="context"> @doctype_id = :transitional
end
def generate_content
html_body do
</pre><pre class="diff" id="removed">- html_h3("Packages")
</pre><pre class="diff" id="added">+ html_h3(_("Packages"))
</pre><pre class="diff" id="context"> html_ul("class"=>"navigation_list") do
html_li do
</pre><pre class="diff" id="removed">- html_a(<span id="removedchars">"(All Types)"</span>, {"href"=>"all-types-frame.html", "target"=>"current_package_frame"})
</pre><pre class="diff" id="added">+ html_a(<span id="addedchars">_("(All Types)")</span>, {"href"=>"all-types-frame.html", "target"=>"current_package_frame"})
</pre><pre class="diff" id="context"> end
packages = @type_agregator.packages.sort
packages.each do |package|
</pre><pre class="diff"><small id="info">@@ -106,7 +107,7 @@
</small></pre><pre class="diff" id="context">
def generate_content
html_body do
</pre><pre class="diff" id="removed">- html_h3("All Types")
</pre><pre class="diff" id="added">+ html_h3(_("All Types"))
</pre><pre class="diff" id="context"> html_ul("class"=>"navigation_list") do
types = @type_agregator.types.sort do |a,b|
cmp = a.unqualified_name.downcase <=> b.unqualified_name.downcase
</pre><pre class="diff"><small id="info">@@ -150,17 +151,17 @@
</small></pre><pre class="diff" id="context"> html_frameset("rows"=>"30%,70%") do
html_frame("src"=>"overview-frame.html",
"name"=>"all_packages_frame",
</pre><pre class="diff" id="removed">- "title"=>"All Packages")
</pre><pre class="diff" id="added">+ "title"=>_("All Packages"))
</pre><pre class="diff" id="context"> html_frame("src"=>"all-types-frame.html",
"name"=>"current_package_frame",
</pre><pre class="diff" id="removed">- "title"=><span id="removedchars">"All types"</span>)
</pre><pre class="diff" id="added">+ "title"=><span id="addedchars">_("All types")</span>)
</pre><pre class="diff" id="context"> end
html_frame("src"=>"overview-summary.html",
"name"=>"type_frame",
</pre><pre class="diff" id="removed">- "title"=>"Package and type descriptions")
</pre><pre class="diff" id="added">+ "title"=>_("Package and type descriptions"))
</pre><pre class="diff" id="context"> html_noframes do
html_body do
</pre><pre class="diff" id="removed">- html_a("Non-frameset overview page", {"href"=>"overview-summary.html"})
</pre><pre class="diff" id="added">+ html_a(_("Non-frameset overview page"), {"href"=>"overview-summary.html"})
</pre><pre class="diff" id="context"> end
end
end
</pre></div>
<hr /><a name="file3" /><div class="file">
<span class="pathname">trunk/as2api/output/html</span><br />
<div class="fileheader"><big><b>diff.rb</b></big> <small id="info">275 -> 276</small></div>
<pre class="diff"><small id="info">--- trunk/as2api/output/html/diff.rb 2006-02-09 17:42:30 UTC (rev 275)
+++ trunk/as2api/output/html/diff.rb 2006-02-24 00:16:11 UTC (rev 276)
@@ -36,31 +36,31 @@
</small></pre><pre class="diff" id="context"> class DiffOverviewPage < BasicDiffPage
def initialize(conf, api_changes)
super(conf, "change-summary", "changes")
</pre><pre class="diff" id="removed">- @title = "API Change Overview"
</pre><pre class="diff" id="added">+ @title = _("API Change Overview")
</pre><pre class="diff" id="context"> @api_changes = api_changes
end
def generate_body_content
</pre><pre class="diff" id="removed">- html_h1("API Change Overview")
</pre><pre class="diff" id="added">+ html_h1(_("API Change Overview"))
</pre><pre class="diff" id="context">
unless @api_changes
</pre><pre class="diff" id="removed">- html_p("No changes")
</pre><pre class="diff" id="added">+ html_p(_("No changes"))
</pre><pre class="diff" id="context"> return
end
</pre><pre class="diff" id="removed">- summary_table(@api_changes.added_packages, <span id="removedchars">"Added Packages"</span>) do |as_package|
</pre><pre class="diff" id="added">+ summary_table(@api_changes.added_packages, <span id="addedchars">_("Added Packages")</span>) do |as_package|
</pre><pre class="diff" id="context"> name = package_display_name_for(as_package)
href = File.join("..", package_link_for(as_package, "package-summary.html"))
html_a(name, {"href"=>href})
end
</pre><pre class="diff" id="removed">- summary_table(@api_changes.modified_packages, <span id="removedchars">"Modified Packages"</span>) do |as_package|
</pre><pre class="diff" id="added">+ summary_table(@api_changes.modified_packages, <span id="addedchars">_("Modified Packages")</span>) do |as_package|
</pre><pre class="diff" id="context"> name = package_display_name_for(as_package)
href = package_link_for(as_package, "change-summary.html")
html_a(name, {"href", href})
end
</pre><pre class="diff" id="removed">- summary_table(@api_changes.removed_packages, <span id="removedchars">"Removed Packages"</span>) do |as_package|
</pre><pre class="diff" id="added">+ summary_table(@api_changes.removed_packages, <span id="addedchars">_("Removed Packages")</span>) do |as_package|
</pre><pre class="diff" id="context"> name = package_display_name_for(as_package)
pcdata(name)
end
</pre><pre class="diff"><small id="info">@@ -78,25 +78,25 @@
</small></pre><pre class="diff" id="context"> def initialize(conf, package_changes)
dir = File.join("changes", package_dir_for(package_changes))
super(conf, "change-summary", dir)
</pre><pre class="diff" id="removed">- @title = "Package #{package_display_name_for(package_changes)} API Change Overview"
</pre><pre class="diff" id="added">+ @title = _("Package %s API Change Overview") % package_display_name_for(package_changes)
</pre><pre class="diff" id="context"> @package_changes = package_changes
end
def generate_body_content
html_h1(@title)
</pre><pre class="diff" id="removed">- summary_table(@package_changes.added_types, <span id="removedchars">"Added Types"</span>) do |as_type|
</pre><pre class="diff" id="added">+ summary_table(@package_changes.added_types, <span id="addedchars">_("Added Types")</span>) do |as_type|
</pre><pre class="diff" id="context"> name = as_type.unqualified_name
pcdata(name)
end
</pre><pre class="diff" id="removed">- summary_table(@package_changes.modified_types, <span id="removedchars">"Modified Types"</span>) do |as_type|
</pre><pre class="diff" id="added">+ summary_table(@package_changes.modified_types, <span id="addedchars">_("Modified Types")</span>) do |as_type|
</pre><pre class="diff" id="context"> name = as_type.new_type.unqualified_name
href = "#{name}.html"
html_a(name, {"href", href})
end
</pre><pre class="diff" id="removed">- summary_table(@package_changes.removed_types, <span id="removedchars">"Removed Types"</span>) do |as_type|
</pre><pre class="diff" id="added">+ summary_table(@package_changes.removed_types, <span id="addedchars">_("Removed Types")</span>) do |as_type|
</pre><pre class="diff" id="context"> name = as_type.unqualified_name
pcdata(name)
end
</pre><pre class="diff"><small id="info">@@ -114,59 +114,59 @@
</small></pre><pre class="diff" id="context"> def initialize(conf, type_changes)
dir = File.join("changes", type_changes.new_type.package_name.gsub(/\./, "/"))
super(conf, type_changes.new_type.unqualified_name, dir)
</pre><pre class="diff" id="removed">- @title = "#{type_changes.new_type.unqualified_name} API Change Overview"
</pre><pre class="diff" id="added">+ @title = _("%d API Change Overview") % type_changes.new_type.unqualified_name
</pre><pre class="diff" id="context"> @type_changes = type_changes
end
def generate_body_content
html_h1(@title)
</pre><pre class="diff" id="removed">- summary_table(@type_changes.added_fields, <span id="removedchars">"Added Fields"</span>) do |as_field|
</pre><pre class="diff" id="added">+ summary_table(@type_changes.added_fields, <span id="addedchars">_("Added Fields")</span>) do |as_field|
</pre><pre class="diff" id="context"> pcdata(as_field.name)
end
</pre><pre class="diff" id="removed">- summary_table_tr(@type_changes.modified_fields, <span id="removedchars">"Modified Fields"</span>) do |field_changes|
</pre><pre class="diff" id="added">+ summary_table_tr(@type_changes.modified_fields, <span id="addedchars">_("Modified Fields")</span>) do |field_changes|
</pre><pre class="diff" id="context"> html_td do
pcdata(field_changes.name)
end
html_td do
generate_visibility_change(field_changes)
generate_static_change(field_changes)
</pre><pre class="diff" id="removed">- generate_type_change(<span id="removedchars">"Field"</span>, field_changes)
</pre><pre class="diff" id="added">+ generate_type_change(<span id="addedchars">_("Field")</span>, field_changes)
</pre><pre class="diff" id="context"> generate_readwrite_change(field_changes)
end
end
</pre><pre class="diff" id="removed">- summary_table(@type_changes.removed_fields, <span id="removedchars">"Removed Fields"</span>) do |as_field|
</pre><pre class="diff" id="added">+ summary_table(@type_changes.removed_fields, <span id="addedchars">_("Removed Fields")</span>) do |as_field|
</pre><pre class="diff" id="context"> pcdata(as_field.name)
end
</pre><pre class="diff" id="removed">- summary_table(@type_changes.added_methods, <span id="removedchars">"Added Methods"</span>) do |as_method|
</pre><pre class="diff" id="added">+ summary_table(@type_changes.added_methods, <span id="addedchars">_("Added Methods")</span>) do |as_method|
</pre><pre class="diff" id="context"> pcdata(as_method.name)
end
</pre><pre class="diff" id="removed">- summary_table_tr(@type_changes.modified_methods, <span id="removedchars">"Modified Methods"</span>) do |method_changes|
</pre><pre class="diff" id="added">+ summary_table_tr(@type_changes.modified_methods, <span id="addedchars">_("Modified Methods")</span>) do |method_changes|
</pre><pre class="diff" id="context"> html_td do
pcdata(method_changes.name)
end
html_td do
generate_visibility_change(method_changes)
generate_static_change(method_changes)
</pre><pre class="diff" id="removed">- generate_type_change(<span id="removedchars">"Return"</span>, method_changes)
</pre><pre class="diff" id="added">+ generate_type_change(<span id="addedchars">_("Return")</span>, method_changes)
</pre><pre class="diff" id="context"> generate_args_change(method_changes)
end
end
</pre><pre class="diff" id="removed">- summary_table(@type_changes.removed_methods, <span id="removedchars">"Removed Methods"</span>) do |as_method|
</pre><pre class="diff" id="added">+ summary_table(@type_changes.removed_methods, <span id="addedchars">_("Removed Methods")</span>) do |as_method|
</pre><pre class="diff" id="context"> pcdata(as_method.name)
end
end
def generate_visibility_change(field_changes)
if field_changes.visibility_change
</pre><pre class="diff" id="removed">- pcdata("Visibility changed from ")
</pre><pre class="diff" id="added">+ pcdata(_("Visibility changed from "))
</pre><pre class="diff" id="context"> html_code(field_changes.visibility_change.old_vis)
</pre><pre class="diff" id="removed">- pcdata(" to ")
</pre><pre class="diff" id="added">+ pcdata(_(" to "))
</pre><pre class="diff" id="context"> html_code(field_changes.visibility_change.new_vis)
pcdata(". ")
end
</pre><pre class="diff"><small id="info">@@ -175,10 +175,11 @@
</small></pre><pre class="diff" id="context"> def generate_static_change(field_changes)
if field_changes.static_change
if field_changes.static_change.new_flag
</pre><pre class="diff" id="removed">- pcdata("Is now ")
</pre><pre class="diff" id="added">+ pcdata(_("Is now"))
</pre><pre class="diff" id="context"> else
</pre><pre class="diff" id="removed">- pcdata("Is no longer ")
</pre><pre class="diff" id="added">+ pcdata(_("Is no longer"))
</pre><pre class="diff" id="context"> end
</pre><pre class="diff" id="added">+ pcdata(" ")
</pre><pre class="diff" id="context"> html_code("static")
pcdata(". ")
end
</pre><pre class="diff"><small id="info">@@ -188,16 +189,16 @@
</small></pre><pre class="diff" id="context"> if name
html_code(name)
else
</pre><pre class="diff" id="removed">- pcdata("unspecified")
</pre><pre class="diff" id="added">+ pcdata(_("unspecified"))
</pre><pre class="diff" id="context"> end
end
def generate_type_change(kind, field_changes)
if field_changes.type_change
pcdata(kind)
</pre><pre class="diff" id="removed">- pcdata(" type changed from ")
</pre><pre class="diff" id="added">+ pcdata(_(" type changed from "))
</pre><pre class="diff" id="context"> generate_type_name(field_changes.type_change.old_type_name)
</pre><pre class="diff" id="removed">- pcdata(" to ")
</pre><pre class="diff" id="added">+ pcdata(_(" to "))
</pre><pre class="diff" id="context"> generate_type_name(field_changes.type_change.new_type_name)
pcdata(". ")
end
</pre><pre class="diff"><small id="info">@@ -208,16 +209,16 @@
</small></pre><pre class="diff" id="context"> if change
if change.old_read != change.new_read
if change.new_read
</pre><pre class="diff" id="removed">- pcdata("Is now readable")
</pre><pre class="diff" id="added">+ pcdata(_("Is now readable"))
</pre><pre class="diff" id="context"> else
</pre><pre class="diff" id="removed">- pcdata("Is no longer readable")
</pre><pre class="diff" id="added">+ pcdata(_("Is no longer readable"))
</pre><pre class="diff" id="context"> end
end
if change.old_write != change.new_write
if change.new_write
</pre><pre class="diff" id="removed">- pcdata("Is now writeable")
</pre><pre class="diff" id="added">+ pcdata(_("Is now writeable"))
</pre><pre class="diff" id="context"> else
</pre><pre class="diff" id="removed">- pcdata("Is no longer writeable")
</pre><pre class="diff" id="added">+ pcdata(_("Is no longer writeable"))
</pre><pre class="diff" id="context"> end
end
end
</pre><pre class="diff"><small id="info">@@ -226,9 +227,9 @@
</small></pre><pre class="diff" id="context"> def generate_args_change(method_changes)
changes = method_changes.args_change
if changes
</pre><pre class="diff" id="removed">- pcdata("Argument list changed from ")
</pre><pre class="diff" id="added">+ pcdata(_("Argument list changed from "))
</pre><pre class="diff" id="context"> list_args(changes.old_args)
</pre><pre class="diff" id="removed">- pcdata(" to ")
</pre><pre class="diff" id="added">+ pcdata(_(" to "))
</pre><pre class="diff" id="context"> list_args(changes.new_args)
pcdata(".")
end
</pre></div>
<hr /><a name="file4" /><div class="file">
<span class="pathname">trunk/as2api/output/html</span><br />
<div class="fileheader"><big><b>driver.rb</b></big> <small id="info">275 -> 276</small></div>
<pre class="diff"><small id="info">--- trunk/as2api/output/html/driver.rb 2006-02-09 17:42:30 UTC (rev 275)
+++ trunk/as2api/output/html/driver.rb 2006-02-24 00:16:11 UTC (rev 276)
@@ -16,6 +16,7 @@
</small></pre><pre class="diff" id="context"> require 'output/html/default_css'
</pre><pre class="diff" id="added">+bindtextdomain("as2api")
</pre><pre class="diff" id="context">
def package_list(path_name, type_agregator)
# REVISIT: Will a package list actually be useful for ActionScript, or can
</pre><pre class="diff"><small id="info">@@ -106,11 +107,11 @@
</small></pre><pre class="diff" id="context">
def build_navigation_template
elements = []
</pre><pre class="diff" id="removed">- elements << OverviewNavLinkBuilder.new(@conf, "Overview")
- elements << PackageNavLinkBuilder.new(@conf, "Package")
- elements << TypeNavLinkBuilder.new(@conf, "Class")
- elements << SourceNavLinkBuilder.new(@conf, "Source") if @conf.sources
- elements << IndexNavLinkBuilder.new(@conf, "Index")
</pre><pre class="diff" id="added">+ elements << OverviewNavLinkBuilder.new(@conf, _("Overview"))
+ elements << PackageNavLinkBuilder.new(@conf, _("Package"))
+ elements << TypeNavLinkBuilder.new(@conf, _("Class"))
+ elements << SourceNavLinkBuilder.new(@conf, _("Source")) if @conf.sources
+ elements << IndexNavLinkBuilder.new(@conf, _("Index"))
</pre><pre class="diff" id="context"> elements
end
end
</pre></div>
<hr /><a name="file5" /><div class="file">
<span class="pathname">trunk/as2api/output/html</span><br />
<div class="fileheader"><big><b>html_framework.rb</b></big> <small id="info">275 -> 276</small></div>
<pre class="diff"><small id="info">--- trunk/as2api/output/html/html_framework.rb 2006-02-09 17:42:30 UTC (rev 275)
+++ trunk/as2api/output/html/html_framework.rb 2006-02-24 00:16:11 UTC (rev 276)
@@ -7,13 +7,18 @@
</small></pre><pre class="diff" id="context"> #
</pre><pre class="diff" id="added">+require 'gettext'
+
</pre><pre class="diff" id="context"> require 'output/utils'
require 'xmlwriter'
require 'xhtmlwriter'
require 'output/xml/xml_formatter'
</pre><pre class="diff" id="added">+include GetText
</pre><pre class="diff" id="context">
</pre><pre class="diff" id="added">+bindtextdomain("as2api")
+
</pre><pre class="diff" id="context"> PROJECT_PAGE = "http://www.badgers-in-foil.co.uk/projects/as2api/"
</pre><pre class="diff"><small id="info">@@ -46,7 +51,7 @@
</small></pre><pre class="diff" id="context"> @io = nil # to be set during the lifetime of generate() call
end
</pre><pre class="diff" id="removed">- attr_accessor :path_name, :encoding, :doctype_id, :title_extra
</pre><pre class="diff" id="added">+ attr_accessor :path_name, :encoding, :<span id="addedchars">lang, :</span>doctype_id, :title_extra
</pre><pre class="diff" id="context">
attr_writer :title, :base_name
</pre><pre class="diff"><small id="info">@@ -66,6 +71,26 @@
</small></pre><pre class="diff" id="context"> end
end
</pre><pre class="diff" id="added">+ def lang_to_gettext_locale(str)
+ return nil unless str
+ str.gsub(/-/, "_")
+ end
+
+ def with_message_locale(locale)
+ if locale
+ old_locale = Locale.get
+$stderr.puts("Locale: #{old_locale} -> #{locale}")
+ Locale.set(Locale::MESSAGES, locale)
+ begin
+ yield
+ ensure
+ Locale.set(Locale::MESSAGES, old_locale)
+ end
+ else
+ yield
+ end
+ end
+
</pre><pre class="diff" id="context"> def generate(xml_writer)
@io = xml_writer
if encoding.nil?
</pre><pre class="diff"><small id="info">@@ -91,10 +116,17 @@
</small></pre><pre class="diff" id="context"> else
raise "unhandled doctype #{doctype_id.inspect}"
end
</pre><pre class="diff" id="removed">- html_html do
- generate_head
- generate_content
</pre><pre class="diff" id="added">+ attrs = {}
+ if lang
+ attrs["lang"] = lang
+ attrs["xml:lang"] = lang
</pre><pre class="diff" id="context"> end
</pre><pre class="diff" id="added">+ with_message_locale(lang_to_gettext_locale(lang)) do
+ html_html(attrs) do
+ generate_head
+ generate_content
+ end
+ end
</pre><pre class="diff" id="context"> end
def generate_head
</pre><pre class="diff"><small id="info">@@ -213,9 +245,9 @@
</small></pre><pre class="diff" id="context">
def type_description_for(as_type)
if as_type.instance_of?(ASClass)
</pre><pre class="diff" id="removed">- "Class #{as_type.qualified_name}"
</pre><pre class="diff" id="added">+ _("Class %s") % as_type.qualified_name
</pre><pre class="diff" id="context"> elsif as_type.instance_of?(ASInterface)
</pre><pre class="diff" id="removed">- "Interface #{as_type.qualified_name}"
</pre><pre class="diff" id="added">+ _("Interface %s") % as_type.qualified_name
</pre><pre class="diff" id="context"> end
end
</pre><pre class="diff"><small id="info">@@ -298,12 +330,12 @@
</small></pre><pre class="diff" id="context"> end
def package_display_name_for(package)
</pre><pre class="diff" id="removed">- return <span id="removedchars">"(Default)"</span> if package.name == ""
</pre><pre class="diff" id="added">+ return <span id="addedchars">_("(Default)")</span> if package.name == ""
</pre><pre class="diff" id="context"> package.name
end
def package_description_for(package)
</pre><pre class="diff" id="removed">- "Package #{package_display_name_for(package)}"
</pre><pre class="diff" id="added">+ _("Package %s") % package_display_name_for(package)
</pre><pre class="diff" id="context"> end
end
</pre><pre class="diff"><small id="info">@@ -331,7 +363,7 @@
</small></pre><pre class="diff" id="context">
def generate_footer
html_div("class"=>"footer") do
</pre><pre class="diff" id="removed">- html_a("as2api", {"href"=>PROJECT_PAGE, "title"=>"ActionScript 2 API Documentation Generator"})
</pre><pre class="diff" id="added">+ html_a("as2api", {"href"=>PROJECT_PAGE, "title"=>_("ActionScript 2 API Documentation Generator")})
</pre><pre class="diff" id="context"> end
end
</pre><pre class="diff"><small id="info">@@ -459,6 +491,7 @@
</small></pre><pre class="diff" id="context"> list.each_with_index do |page, index|
page.title_extra = conf.title
page.encoding = conf.input_encoding
</pre><pre class="diff" id="added">+ page.lang = conf.target_lang
</pre><pre class="diff" id="context"> conf.progress_listener.generate_page(index, page)
create_page(conf.output_dir, page, conf.format_html)
end
</pre></div>
<hr /><a name="file6" /><div class="file">
<span class="pathname">trunk/as2api/output/html</span><br />
<div class="fileheader"><big><b>index.rb</b></big> <small id="info">275 -> 276</small></div>
<pre class="diff"><small id="info">--- trunk/as2api/output/html/index.rb 2006-02-09 17:42:30 UTC (rev 275)
+++ trunk/as2api/output/html/index.rb 2006-02-24 00:16:11 UTC (rev 276)
@@ -12,6 +12,9 @@
</small></pre><pre class="diff" id="context"> require 'output/html/html_framework'
</pre><pre class="diff" id="added">+bindtextdomain("as2api")
+
+
</pre><pre class="diff" id="context"> class IndexTerm
def <=>(other)
cmp = term.downcase <=> other.term.downcase
</pre><pre class="diff"><small id="info">@@ -31,7 +34,7 @@
</small></pre><pre class="diff" id="context">
def link(out)
out.link_type(@astype)
</pre><pre class="diff" id="removed">- out.pcdata(" in package ")
</pre><pre class="diff" id="added">+ out.pcdata(_(" in package "))
</pre><pre class="diff" id="context"> out.html_a(out.package_display_name_for(@astype.package), {"href"=>"../" + @astype.package_name.gsub(".", "/") + "/package-summary.html"})
end
end
</pre><pre class="diff"><small id="info">@@ -50,7 +53,7 @@
</small></pre><pre class="diff" id="context"> class MethodIndexTerm < MemberIndexTerm
def link(out)
out.link_method(@asmember)
</pre><pre class="diff" id="removed">- out.pcdata(" method in ")
</pre><pre class="diff" id="added">+ out.pcdata(_(" method in "))
</pre><pre class="diff" id="context"> out.link_type(@astype, true)
end
end
</pre><pre class="diff"><small id="info">@@ -58,7 +61,7 @@
</small></pre><pre class="diff" id="context"> class FieldIndexTerm < MemberIndexTerm
def link(out)
out.link_field(@asmember)
</pre><pre class="diff" id="removed">- out.pcdata(" field in ")
</pre><pre class="diff" id="added">+ out.pcdata(_(" field in "))
</pre><pre class="diff" id="context"> out.link_type(@astype, true)
end
end
</pre><pre class="diff"><small id="info">@@ -69,7 +72,7 @@
</small></pre><pre class="diff" id="context">
def is_current?(page) page.is_a?(IndexPage); end
</pre><pre class="diff" id="removed">- def title_on(page); "Alpabetical index of types and members"; end
</pre><pre class="diff" id="added">+ def title_on(page); _("Alpabetical index of types and members"); end
</pre><pre class="diff" id="context"> end
class Indexer
</pre><pre class="diff"><small id="info">@@ -115,7 +118,7 @@
</small></pre><pre class="diff" id="context"> def initialize(conf, indexer)
super(conf, "index", "index-files")
@indexer = indexer
</pre><pre class="diff" id="removed">- @title = "Alphabetical Index"
</pre><pre class="diff" id="added">+ @title = _("Alphabetical Index")
</pre><pre class="diff" id="context"> end
def extra_metadata
</pre><pre class="diff"><small id="info">@@ -152,7 +155,7 @@
</small></pre><pre class="diff" id="context"> end
def link_top
</pre><pre class="diff" id="removed">- yield <span id="removedchars">"Overview"</span>, base_path("overview-summary.html")
</pre><pre class="diff" id="added">+ yield <span id="addedchars">_("Overview")</span>, base_path("overview-summary.html")
</pre><pre class="diff" id="context"> end
end
</pre></div>
<hr /><a name="file7" /><div class="file">
<span class="pathname">trunk/as2api/output/html</span><br />
<div class="fileheader"><big><b>sources.rb</b></big> <small id="info">275 -> 276</small></div>
<pre class="diff"><small id="info">--- trunk/as2api/output/html/sources.rb 2006-02-09 17:42:30 UTC (rev 275)
+++ trunk/as2api/output/html/sources.rb 2006-02-24 00:16:11 UTC (rev 276)
@@ -22,7 +22,7 @@
</small></pre><pre class="diff" id="context">
def title_on(page)
if page.astype
</pre><pre class="diff" id="removed">- "Source code of #{page.astype.qualified_name}"
</pre><pre class="diff" id="added">+ _("Source code of %s") % page.astype.qualified_name
</pre><pre class="diff" id="context"> else
nil
end
</pre><pre class="diff"><small id="info">@@ -198,7 +198,7 @@
</small></pre><pre class="diff" id="context">
def link_top
</pre><pre class="diff" id="removed">- yield <span id="removedchars">"Overview"</span>, base_path("overview-summary.html")
</pre><pre class="diff" id="added">+ yield <span id="addedchars">_("Overview")</span>, base_path("overview-summary.html")
</pre><pre class="diff" id="context"> end
end
</pre></div>
<hr /><a name="file8" /><div class="file">
<span class="pathname">trunk/as2api/ui</span><br />
<div class="fileheader"><big><b>cli.rb</b></big> <small id="info">275 -> 276</small></div>
<pre class="diff"><small id="info">--- trunk/as2api/ui/cli.rb 2006-02-09 17:42:30 UTC (rev 275)
+++ trunk/as2api/ui/cli.rb 2006-02-24 00:16:11 UTC (rev 276)
@@ -7,12 +7,18 @@
</small></pre><pre class="diff" id="context"> #
</pre><pre class="diff" id="added">+require 'gettext'
+
</pre><pre class="diff" id="context"> require 'documenter'
require 'getoptlong'
require 'set'
require 'output/html/driver'
require 'output/html/diff'
</pre><pre class="diff" id="added">+include GetText
+
+bindtextdomain("as2api")
+
</pre><pre class="diff" id="context"> Conf = Struct.new(:output_dir,
:classpath,
:oldrev_classpath,
</pre><pre class="diff"><small id="info">@@ -23,7 +29,9 @@
</small></pre><pre class="diff" id="context"> :draw_diagrams,
:dot_exe,
:sources,
</pre><pre class="diff" id="removed">- :format_html<span id="removedchars">)</span>
</pre><pre class="diff" id="added">+ :format_html<span id="addedchars">,</span>
+ :source_lang,
+ :target_lang)
</pre><pre class="diff" id="context">
SourceFile = Struct.new(:prefix, :suffix)
</pre><pre class="diff"><small id="info">@@ -58,7 +66,7 @@
</small></pre><pre class="diff" id="context"> class VerboseProgressListener < NullProgressListener
def parsing_sources(total_files)
@total = total_files
</pre><pre class="diff" id="removed">- $stderr.puts("Parsing #{total_files} source files:")
</pre><pre class="diff" id="added">+ $stderr.puts(_("Parsing %d source files:") % total_files)
</pre><pre class="diff" id="context"> yield
progress_bar(total_files) # ensure we see '100%'
puts
</pre><pre class="diff"><small id="info">@@ -70,7 +78,7 @@
</small></pre><pre class="diff" id="context">
def generating_pages(total_pages)
@total = total_pages
</pre><pre class="diff" id="removed">- $stderr.puts("Generating #{total_pages} HTML pages:")
</pre><pre class="diff" id="added">+ $stderr.puts(_("Generating %d HTML pages:") % total_pages)
</pre><pre class="diff" id="context"> yield
progress_bar(total_pages) # ensure we see '100%'
puts
</pre><pre class="diff"><small id="info">@@ -105,7 +113,9 @@
</small></pre><pre class="diff" id="context"> [ "--draw-diagrams", GetoptLong::NO_ARGUMENT ],
[ "--dot-exe", GetoptLong::REQUIRED_ARGUMENT ],
[ "--sources", GetoptLong::NO_ARGUMENT ],
</pre><pre class="diff" id="removed">- [ "--format-html", GetoptLong::NO_ARGUMENT ]
</pre><pre class="diff" id="added">+ [ "--format-html", GetoptLong::NO_ARGUMENT ],
+ [ "--source-lang", GetoptLong::REQUIRED_ARGUMENT ],
+ [ "--target-lang", GetoptLong::REQUIRED_ARGUMENT ]
</pre><pre class="diff" id="context"> )
conf = Conf.new
</pre><pre class="diff"><small id="info">@@ -140,11 +150,15 @@
</small></pre><pre class="diff" id="context"> conf.sources = true
when "--format-html"
conf.format_html = true
</pre><pre class="diff" id="added">+ when "--source-lang"
+ conf.source_lang = arg
+ when "--target-lang"
+ conf.target_lang = arg
</pre><pre class="diff" id="context"> end
end
if ARGV.empty?
usage
</pre><pre class="diff" id="removed">- error("No packages specified")
</pre><pre class="diff" id="added">+ error(_("No packages specified"))
</pre><pre class="diff" id="context"> end
ARGV.each do |package_spec|
conf.package_filters << to_filter(package_spec)
</pre><pre class="diff"><small id="info">@@ -186,13 +200,13 @@
</small></pre><pre class="diff" id="context"> else
dirname = File.dirname(source)
if ignored_packages.add?(dirname)
</pre><pre class="diff" id="removed">- warn("package #{dirname.gsub(/\//, '.').inspect} will not be documented")
</pre><pre class="diff" id="added">+ warn(_("package %s will not be documented") % dirname.gsub(/\//, '.').inspect)
</pre><pre class="diff" id="context"> end
end
found_sources = true
end
unless found_sources
</pre><pre class="diff" id="removed">- warn("#{path.inspect} contains no ActionScript files")
</pre><pre class="diff" id="added">+ warn(_("%s contains no ActionScript files") % path.inspect)
</pre><pre class="diff" id="context"> end
end
result
</pre><pre class="diff"><small id="info">@@ -226,14 +240,14 @@
</small></pre><pre class="diff" id="context"> def main
@conf = parse_opts
files = find_sources(@conf.classpath)
</pre><pre class="diff" id="removed">- error("No source files matching specified packages") if files.empty?
</pre><pre class="diff" id="added">+ error(_("No source files matching specified packages")) if files.empty?
</pre><pre class="diff" id="context"> type_agregator = parse_all(files, @conf.classpath)
type_agregator.resolve_types
document_types(@conf, type_agregator)
unless @conf.oldrev_classpath.empty?
old_files = find_sources(@conf.oldrev_classpath)
</pre><pre class="diff" id="removed">- error("No source files matching specified packages in oldrev-classpath") if old_files.empty?
</pre><pre class="diff" id="added">+ error(_("No source files matching specified packages in oldrev-classpath")) if old_files.empty?
</pre><pre class="diff" id="context"> old_type_agregator = parse_all(old_files, @conf.oldrev_classpath)
old_type_agregator.resolve_types
diff = APIDiff.new
</pre><pre class="diff"><small id="info">@@ -284,12 +298,12 @@
</small></pre><pre class="diff" id="context"> end
def error(msg)
</pre><pre class="diff" id="removed">- $stderr.puts("error: #{msg}")
</pre><pre class="diff" id="added">+ $stderr.puts(_("error: %s") % msg)
</pre><pre class="diff" id="context"> exit(-1)
end
def warn(msg)
</pre><pre class="diff" id="removed">- $stderr.puts("warning: #{msg}")
</pre><pre class="diff" id="added">+ $stderr.puts(_("warning: %s") % msg)
</pre><pre class="diff" id="context"> end
end
</pre></div>
<center><small><a href="http://www.badgers-in-foil.co.uk/projects/cvsspam/" title="commit -> email">CVSspam</a> 0.2.11</small></center>
</body></html>