Skip to content

D
dragonwell8_langtools

openanolis / dragonwell8_langtools

通知 0
Star 2
Fork 0
D
dragonwell8_langtools
提交 e1ce4f9a 编写于 作者: B bpatel
浏览文件
操作

7025314: NLS: translatability violation on standard.properties 

Reviewed-by: jjg
上级 23e82539
隐藏空白更改
内联 并排
Showing with 46 addition and 79 deletion
src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java
浏览文件 @ e1ce4f9a
/*
* Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
......@@ -188,8 +188,8 @@ public class HtmlWriter extends PrintWriter {
nextclassLabel = getResource("doclet.Next_Class");
summaryLabel = getResource("doclet.Summary");
detailLabel = getResource("doclet.Detail");
framesLabel = getResource("doclet.FRAMES");
noframesLabel = getResource("doclet.NO_FRAMES");
framesLabel = getResource("doclet.Frames");
noframesLabel = getResource("doclet.No_Frames");
treeLabel = getResource("doclet.Tree");
classLabel = getResource("doclet.Class");
deprecatedLabel = getResource("doclet.navDeprecated");
......
src/share/classes/com/sun/tools/doclets/formats/html/resources/standard.properties
浏览文件 @ e1ce4f9a
......@@ -11,54 +11,30 @@ doclet.Window_Class_Hierarchy=Class Hierarchy
doclet.Interface_Hierarchy=Interface Hierarchy
doclet.Enum_Hierarchy=Enum Hierarchy
doclet.Annotation_Type_Hierarchy=Annotation Type Hierarchy
# The following ALL CAPS words should be translated. It is used as "Previous" link on javadoc.
doclet.Prev=PREV
# The following ALL CAPS words should be translated. It is used as "Next" link on javadoc.
doclet.Next=NEXT
# The following ALL CAPS words should be translated. It is used as "Previous Class" link on javadoc.
doclet.Prev_Class=PREV CLASS
# The following ALL CAPS words should be translated. It is used as "Next Class" link on javadoc.
doclet.Next_Class=NEXT CLASS
# The following ALL CAPS words should be translated. It is used as "Previous Package" link on javadoc.
doclet.Prev_Package=PREV PACKAGE
# The following ALL CAPS words should be translated. It is used as "Next Package" link on javadoc.
doclet.Next_Package=NEXT PACKAGE
# The following ALL CAPS words should be translated. It is used as "Previous Letter" link on javadoc alphabetical index.
doclet.Prev_Letter=PREV LETTER
# The following ALL CAPS words should be translated. It is used as "Next Letter" link on javadoc alphabetical index.
doclet.Next_Letter=NEXT LETTER
# The following ALL CAPS words should be translated. It is used as "Show List" link on javadoc.
doclet.Show_Lists=SHOW LISTS
# The following ALL CAPS words should be translated. It is used as "Hide List" link on javadoc.
doclet.Hide_Lists=HIDE LISTS
doclet.Prev=Prev
doclet.Next=Next
doclet.Prev_Class=Prev Class
doclet.Next_Class=Next Class
doclet.Prev_Package=Prev Package
doclet.Next_Package=Next Package
doclet.Prev_Letter=Prev Letter
doclet.Next_Letter=Next Letter
doclet.Href_Class_Title=class in {0}
doclet.Href_Interface_Title=interface in {0}
doclet.Href_Annotation_Title=annotation in {0}
doclet.Href_Enum_Title=enum in {0}
doclet.Href_Type_Param_Title=type parameter in {0}
doclet.Href_Class_Or_Interface_Title=class or interface in {0}
# The following ALL CAPS words should be translated. It's used as SUMMARY: NESTED | FIELD | CONSTR | METHOD, meaning Nested Class Summary, Field Summary, Constructor Summary, or Method Summary.
doclet.Summary=SUMMARY:
# The following ALL CAPS words should be translated. It is used as DETAIL: FIELD | CONSTR | METHOD, meaning Field Detail, Constructor Detail, or Method Detail.
doclet.Detail=DETAIL:
# The following ALL CAPS words should be translated. It is used as "Nested" (Nested Class Summary) link on javadoc.
doclet.navNested=NESTED
# The following ALL CAPS words should be translated. It is used as "Optional" (Optional Element Summary) link on javadoc.
doclet.navAnnotationTypeOptionalMember=OPTIONAL
# The following ALL CAPS words should be translated. It is used as "Required" (Required Element Summary) link on javadoc.
doclet.navAnnotationTypeRequiredMember=REQUIRED
# The following ALL CAPS words should be translated. It is used as "Element" (Required Element Summary) link on javadoc.
doclet.navAnnotationTypeMember=ELEMENT
# The following ALL CAPS words should be translated. It is used as "Field" (Field Detail) link on javadoc.
doclet.navField=FIELD
# The following ALL CAPS words should be translated. It is used as "Enum Constants" link on javadoc.
doclet.navEnum=ENUM CONSTANTS
# The following ALL CAPS words should be translated. It is used as "Constructor" (Constructor Detail) link on javadoc.
doclet.navConstructor=CONSTR
# The following ALL CAPS words should be translated. It is used as "Method" (Method Detail) link on javadoc.
doclet.navMethod=METHOD
# The following resource does not seem to be used anymore.
doclet.navFactoryMethod=FACTORY
doclet.Summary=Summary:
doclet.Detail=Detail:
doclet.navNested=Nested
doclet.navAnnotationTypeOptionalMember=Optional
doclet.navAnnotationTypeRequiredMember=Required
doclet.navAnnotationTypeMember=Element
doclet.navField=Field
doclet.navEnum=Enum Constants
doclet.navConstructor=Constr
doclet.navMethod=Method
doclet.Index=Index
doclet.Window_Single_Index=Index
doclet.Window_Split_Index={0}-Index
......@@ -66,12 +42,6 @@ doclet.Help=Help
doclet.Skip_navigation_links=Skip navigation links
doclet.New_Page=NewPage
doclet.None=None
# The following resource does not seem to be used anymore
doclet.CLASSES=CLASSES
# The following resource does not seem to be used anymore
doclet.MEMBERS=MEMBERS
# The following resource does not seem to be used anymore
doclet.NONE=NONE
doclet.Factory_Method_Detail=Static Factory Method Detail
doclet.navDeprecated=Deprecated
doclet.Deprecated_List=Deprecated List
......@@ -136,10 +106,7 @@ doclet.also=also
doclet.Option=Option
doclet.Or=Or
doclet.Frames=Frames
# The following ALL CAPS words should be translated. It is used as "FRAMES" javadoc navigation link to indicate displaying the page with HTML frames.
doclet.FRAMES=FRAMES
# The following ALL CAPS words should be translated. It is used as "NO FRAMES" javadoc navigation link to indicate displaying the page without HTML frames.
doclet.NO_FRAMES=NO FRAMES
doclet.No_Frames=No Frames
doclet.Package_Hierarchies=Package Hierarchies:
doclet.Hierarchy_For_Package=Hierarchy For Package {0}
doclet.Source_Code=Source Code:
......
src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/stylesheet.css
浏览文件 @ e1ce4f9a
......@@ -142,19 +142,19 @@ ul.navList li.navBarCell1Rev {
.subNav ul.navList {
float:left;
margin:0;
font-size:0.7em;
font-size:0.8em;
width:350px;
}
ul.subNavList {
float:left;
margin:0;
font-size:0.7em;
font-size:0.8em;
width:350px;
}
ul.subNavList li{
list-style:none;
float:left;
font-size:90%;
font-size:98%;
}
/*
Page header and footer styles
......
test/com/sun/javadoc/testJavascript/TestJavascript.java
浏览文件 @ e1ce4f9a
/*
* Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
......@@ -23,7 +23,7 @@
/*
* @test
* @bug 4665566 4855876
* @bug 4665566 4855876 7025314
* @summary Verify that the output has the right javascript.
* @author jamieh
* @library ../lib/
......@@ -45,9 +45,9 @@ public class TestJavascript extends JavadocTester {
//Input for string search tests.
private static final String[][] TEST = {
{BUG_ID + FS + "pkg" + FS + "C.html",
"<a href=\"../index.html?pkg/C.html\" target=\"_top\">FRAMES</a>"},
"<a href=\"../index.html?pkg/C.html\" target=\"_top\">Frames</a>"},
{BUG_ID + FS + "TestJavascript.html",
"<a href=\"index.html?TestJavascript.html\" target=\"_top\">FRAMES</a>"},
"<a href=\"index.html?TestJavascript.html\" target=\"_top\">Frames</a>"},
{BUG_ID + FS + "index.html",
"<script type=\"text/javascript\">" + NL +
" targetPage = \"\" + window.location.search;" + NL +
......
test/com/sun/javadoc/testNavagation/TestNavagation.java
浏览文件 @ e1ce4f9a
/*
* Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
......@@ -23,7 +23,7 @@
/*
* @test
* @bug 4131628 4664607
* @bug 4131628 4664607 7025314
* @summary Make sure the Next/Prev Class links iterate through all types.
* Make sure the navagation is 2 columns, not 3.
* @author jamieh
......@@ -45,20 +45,20 @@ public class TestNavagation extends JavadocTester {
//Input for string search tests.
private static final String[][] TEST = {
{BUG_ID + FS + "pkg" + FS + "A.html", "<li>PREV CLASS</li>"},
{BUG_ID + FS + "pkg" + FS + "A.html", "<li>Prev Class</li>"},
{BUG_ID + FS + "pkg" + FS + "A.html",
"<a href=\"../pkg/C.html\" title=\"class in pkg\"><span class=\"strong\">NEXT CLASS</span></a>"},
"<a href=\"../pkg/C.html\" title=\"class in pkg\"><span class=\"strong\">Next Class</span></a>"},
{BUG_ID + FS + "pkg" + FS + "C.html",
"<a href=\"../pkg/A.html\" title=\"annotation in pkg\"><span class=\"strong\">PREV CLASS</span></a>"},
"<a href=\"../pkg/A.html\" title=\"annotation in pkg\"><span class=\"strong\">Prev Class</span></a>"},
{BUG_ID + FS + "pkg" + FS + "C.html",
"<a href=\"../pkg/E.html\" title=\"enum in pkg\"><span class=\"strong\">NEXT CLASS</span></a>"},
"<a href=\"../pkg/E.html\" title=\"enum in pkg\"><span class=\"strong\">Next Class</span></a>"},
{BUG_ID + FS + "pkg" + FS + "E.html",
"<a href=\"../pkg/C.html\" title=\"class in pkg\"><span class=\"strong\">PREV CLASS</span></a>"},
"<a href=\"../pkg/C.html\" title=\"class in pkg\"><span class=\"strong\">Prev Class</span></a>"},
{BUG_ID + FS + "pkg" + FS + "E.html",
"<a href=\"../pkg/I.html\" title=\"interface in pkg\"><span class=\"strong\">NEXT CLASS</span></a>"},
"<a href=\"../pkg/I.html\" title=\"interface in pkg\"><span class=\"strong\">Next Class</span></a>"},
{BUG_ID + FS + "pkg" + FS + "I.html",
"<a href=\"../pkg/E.html\" title=\"enum in pkg\"><span class=\"strong\">PREV CLASS</span></a>"},
{BUG_ID + FS + "pkg" + FS + "I.html", "<li>NEXT CLASS</li>"},
"<a href=\"../pkg/E.html\" title=\"enum in pkg\"><span class=\"strong\">Prev Class</span></a>"},
{BUG_ID + FS + "pkg" + FS + "I.html", "<li>Next Class</li>"},
// Test for 4664607
{BUG_ID + FS + "pkg" + FS + "I.html",
"<a href=\"#skip-navbar_top\" title=\"Skip navigation links\"></a><a name=\"navbar_top_firstrow\">" + NL +
......
test/com/sun/javadoc/testNewLanguageFeatures/TestNewLanguageFeatures.java
浏览文件 @ e1ce4f9a
/*
* Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
......@@ -23,7 +23,7 @@
/*
* @test
* @bug 4789689 4905985 4927164 4827184 4993906 5004549
* @bug 4789689 4905985 4927164 4827184 4993906 5004549 7025314
* @summary Run Javadoc on a set of source files that demonstrate new
* language features. Check the output to ensure that the new
* language features are properly documented.
......@@ -155,14 +155,14 @@ public class TestNewLanguageFeatures extends JavadocTester {
//=================================
//Make sure the summary links are correct.
{BUG_ID + FS + "pkg" + FS + "AnnotationType.html",
"<li>SUMMARY:&nbsp;</li>" + NL +
"<li>Summary:&nbsp;</li>" + NL +
"<li><a href=\"#annotation_type_required_element_summary\">" +
"REQUIRED</a>&nbsp;|&nbsp;</li>" + NL + "<li>" +
"<a href=\"#annotation_type_optional_element_summary\">OPTIONAL</a></li>"},
"Required</a>&nbsp;|&nbsp;</li>" + NL + "<li>" +
"<a href=\"#annotation_type_optional_element_summary\">Optional</a></li>"},
//Make sure the detail links are correct.
{BUG_ID + FS + "pkg" + FS + "AnnotationType.html",
"<li>DETAIL:&nbsp;</li>" + NL +
"<li><a href=\"#annotation_type_element_detail\">ELEMENT</a></li>"},
"<li>Detail:&nbsp;</li>" + NL +
"<li><a href=\"#annotation_type_element_detail\">Element</a></li>"},
//Make sure the heading is correct.
{BUG_ID + FS + "pkg" + FS + "AnnotationType.html",
"Annotation Type AnnotationType</h2>"},
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或