Mercurial > jdk8-mips64-public > langtools / changeset
changeset
7025314: NLS: translatability violation on standard.properties
Tue, 22 Mar 2011 18:32:41 -0700
- author
- bpatel
- date
- Tue, 22 Mar 2011 18:32:41 -0700
- changeset 942
- 148d3dc4e1e1
- parent 938
- e286ec0df754
- child 943
- 72bdd232e0ea
7025314: NLS: translatability violation on standard.properties
Reviewed-by: jjg
1.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java Fri Mar 18 11:00:10 2011 -0700 1.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java Tue Mar 22 18:32:41 2011 -0700 1.3 @@ -1,5 +1,5 @@ 1.4 /* 1.5 - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. 1.6 + * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. 1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 1.8 * 1.9 * This code is free software; you can redistribute it and/or modify it 1.10 @@ -188,8 +188,8 @@ 1.11 nextclassLabel = getResource("doclet.Next_Class"); 1.12 summaryLabel = getResource("doclet.Summary"); 1.13 detailLabel = getResource("doclet.Detail"); 1.14 - framesLabel = getResource("doclet.FRAMES"); 1.15 - noframesLabel = getResource("doclet.NO_FRAMES"); 1.16 + framesLabel = getResource("doclet.Frames"); 1.17 + noframesLabel = getResource("doclet.No_Frames"); 1.18 treeLabel = getResource("doclet.Tree"); 1.19 classLabel = getResource("doclet.Class"); 1.20 deprecatedLabel = getResource("doclet.navDeprecated");
2.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard.properties Fri Mar 18 11:00:10 2011 -0700 2.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard.properties Tue Mar 22 18:32:41 2011 -0700 2.3 @@ -11,54 +11,30 @@ 2.4 doclet.Interface_Hierarchy=Interface Hierarchy 2.5 doclet.Enum_Hierarchy=Enum Hierarchy 2.6 doclet.Annotation_Type_Hierarchy=Annotation Type Hierarchy 2.7 -# The following ALL CAPS words should be translated. It is used as "Previous" link on javadoc. 2.8 -doclet.Prev=PREV 2.9 -# The following ALL CAPS words should be translated. It is used as "Next" link on javadoc. 2.10 -doclet.Next=NEXT 2.11 -# The following ALL CAPS words should be translated. It is used as "Previous Class" link on javadoc. 2.12 -doclet.Prev_Class=PREV CLASS 2.13 -# The following ALL CAPS words should be translated. It is used as "Next Class" link on javadoc. 2.14 -doclet.Next_Class=NEXT CLASS 2.15 -# The following ALL CAPS words should be translated. It is used as "Previous Package" link on javadoc. 2.16 -doclet.Prev_Package=PREV PACKAGE 2.17 -# The following ALL CAPS words should be translated. It is used as "Next Package" link on javadoc. 2.18 -doclet.Next_Package=NEXT PACKAGE 2.19 -# The following ALL CAPS words should be translated. It is used as "Previous Letter" link on javadoc alphabetical index. 2.20 -doclet.Prev_Letter=PREV LETTER 2.21 -# The following ALL CAPS words should be translated. It is used as "Next Letter" link on javadoc alphabetical index. 2.22 -doclet.Next_Letter=NEXT LETTER 2.23 -# The following ALL CAPS words should be translated. It is used as "Show List" link on javadoc. 2.24 -doclet.Show_Lists=SHOW LISTS 2.25 -# The following ALL CAPS words should be translated. It is used as "Hide List" link on javadoc. 2.26 -doclet.Hide_Lists=HIDE LISTS 2.27 +doclet.Prev=Prev 2.28 +doclet.Next=Next 2.29 +doclet.Prev_Class=Prev Class 2.30 +doclet.Next_Class=Next Class 2.31 +doclet.Prev_Package=Prev Package 2.32 +doclet.Next_Package=Next Package 2.33 +doclet.Prev_Letter=Prev Letter 2.34 +doclet.Next_Letter=Next Letter 2.35 doclet.Href_Class_Title=class in {0} 2.36 doclet.Href_Interface_Title=interface in {0} 2.37 doclet.Href_Annotation_Title=annotation in {0} 2.38 doclet.Href_Enum_Title=enum in {0} 2.39 doclet.Href_Type_Param_Title=type parameter in {0} 2.40 doclet.Href_Class_Or_Interface_Title=class or interface in {0} 2.41 -# 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. 2.42 -doclet.Summary=SUMMARY: 2.43 -# The following ALL CAPS words should be translated. It is used as DETAIL: FIELD | CONSTR | METHOD, meaning Field Detail, Constructor Detail, or Method Detail. 2.44 -doclet.Detail=DETAIL: 2.45 -# The following ALL CAPS words should be translated. It is used as "Nested" (Nested Class Summary) link on javadoc. 2.46 -doclet.navNested=NESTED 2.47 -# The following ALL CAPS words should be translated. It is used as "Optional" (Optional Element Summary) link on javadoc. 2.48 -doclet.navAnnotationTypeOptionalMember=OPTIONAL 2.49 -# The following ALL CAPS words should be translated. It is used as "Required" (Required Element Summary) link on javadoc. 2.50 -doclet.navAnnotationTypeRequiredMember=REQUIRED 2.51 -# The following ALL CAPS words should be translated. It is used as "Element" (Required Element Summary) link on javadoc. 2.52 -doclet.navAnnotationTypeMember=ELEMENT 2.53 -# The following ALL CAPS words should be translated. It is used as "Field" (Field Detail) link on javadoc. 2.54 -doclet.navField=FIELD 2.55 -# The following ALL CAPS words should be translated. It is used as "Enum Constants" link on javadoc. 2.56 -doclet.navEnum=ENUM CONSTANTS 2.57 -# The following ALL CAPS words should be translated. It is used as "Constructor" (Constructor Detail) link on javadoc. 2.58 -doclet.navConstructor=CONSTR 2.59 -# The following ALL CAPS words should be translated. It is used as "Method" (Method Detail) link on javadoc. 2.60 -doclet.navMethod=METHOD 2.61 -# The following resource does not seem to be used anymore. 2.62 -doclet.navFactoryMethod=FACTORY 2.63 +doclet.Summary=Summary: 2.64 +doclet.Detail=Detail: 2.65 +doclet.navNested=Nested 2.66 +doclet.navAnnotationTypeOptionalMember=Optional 2.67 +doclet.navAnnotationTypeRequiredMember=Required 2.68 +doclet.navAnnotationTypeMember=Element 2.69 +doclet.navField=Field 2.70 +doclet.navEnum=Enum Constants 2.71 +doclet.navConstructor=Constr 2.72 +doclet.navMethod=Method 2.73 doclet.Index=Index 2.74 doclet.Window_Single_Index=Index 2.75 doclet.Window_Split_Index={0}-Index 2.76 @@ -66,12 +42,6 @@ 2.77 doclet.Skip_navigation_links=Skip navigation links 2.78 doclet.New_Page=NewPage 2.79 doclet.None=None 2.80 -# The following resource does not seem to be used anymore 2.81 -doclet.CLASSES=CLASSES 2.82 -# The following resource does not seem to be used anymore 2.83 -doclet.MEMBERS=MEMBERS 2.84 -# The following resource does not seem to be used anymore 2.85 -doclet.NONE=NONE 2.86 doclet.Factory_Method_Detail=Static Factory Method Detail 2.87 doclet.navDeprecated=Deprecated 2.88 doclet.Deprecated_List=Deprecated List 2.89 @@ -136,10 +106,7 @@ 2.90 doclet.Option=Option 2.91 doclet.Or=Or 2.92 doclet.Frames=Frames 2.93 -# The following ALL CAPS words should be translated. It is used as "FRAMES" javadoc navigation link to indicate displaying the page with HTML frames. 2.94 -doclet.FRAMES=FRAMES 2.95 -# 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. 2.96 -doclet.NO_FRAMES=NO FRAMES 2.97 +doclet.No_Frames=No Frames 2.98 doclet.Package_Hierarchies=Package Hierarchies: 2.99 doclet.Hierarchy_For_Package=Hierarchy For Package {0} 2.100 doclet.Source_Code=Source Code:
3.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/stylesheet.css Fri Mar 18 11:00:10 2011 -0700 3.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/stylesheet.css Tue Mar 22 18:32:41 2011 -0700 3.3 @@ -142,19 +142,19 @@ 3.4 .subNav ul.navList { 3.5 float:left; 3.6 margin:0; 3.7 - font-size:0.7em; 3.8 + font-size:0.8em; 3.9 width:350px; 3.10 } 3.11 ul.subNavList { 3.12 float:left; 3.13 margin:0; 3.14 - font-size:0.7em; 3.15 + font-size:0.8em; 3.16 width:350px; 3.17 } 3.18 ul.subNavList li{ 3.19 list-style:none; 3.20 float:left; 3.21 - font-size:90%; 3.22 + font-size:98%; 3.23 } 3.24 /* 3.25 Page header and footer styles
4.1 --- a/test/com/sun/javadoc/testJavascript/TestJavascript.java Fri Mar 18 11:00:10 2011 -0700 4.2 +++ b/test/com/sun/javadoc/testJavascript/TestJavascript.java Tue Mar 22 18:32:41 2011 -0700 4.3 @@ -1,5 +1,5 @@ 4.4 /* 4.5 - * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. 4.6 + * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved. 4.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 4.8 * 4.9 * This code is free software; you can redistribute it and/or modify it 4.10 @@ -23,7 +23,7 @@ 4.11 4.12 /* 4.13 * @test 4.14 - * @bug 4665566 4855876 4.15 + * @bug 4665566 4855876 7025314 4.16 * @summary Verify that the output has the right javascript. 4.17 * @author jamieh 4.18 * @library ../lib/ 4.19 @@ -45,9 +45,9 @@ 4.20 //Input for string search tests. 4.21 private static final String[][] TEST = { 4.22 {BUG_ID + FS + "pkg" + FS + "C.html", 4.23 - "<a href=\"../index.html?pkg/C.html\" target=\"_top\">FRAMES</a>"}, 4.24 + "<a href=\"../index.html?pkg/C.html\" target=\"_top\">Frames</a>"}, 4.25 {BUG_ID + FS + "TestJavascript.html", 4.26 - "<a href=\"index.html?TestJavascript.html\" target=\"_top\">FRAMES</a>"}, 4.27 + "<a href=\"index.html?TestJavascript.html\" target=\"_top\">Frames</a>"}, 4.28 {BUG_ID + FS + "index.html", 4.29 "<script type=\"text/javascript\">" + NL + 4.30 " targetPage = \"\" + window.location.search;" + NL +
5.1 --- a/test/com/sun/javadoc/testNavagation/TestNavagation.java Fri Mar 18 11:00:10 2011 -0700 5.2 +++ b/test/com/sun/javadoc/testNavagation/TestNavagation.java Tue Mar 22 18:32:41 2011 -0700 5.3 @@ -1,5 +1,5 @@ 5.4 /* 5.5 - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. 5.6 + * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. 5.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 5.8 * 5.9 * This code is free software; you can redistribute it and/or modify it 5.10 @@ -23,7 +23,7 @@ 5.11 5.12 /* 5.13 * @test 5.14 - * @bug 4131628 4664607 5.15 + * @bug 4131628 4664607 7025314 5.16 * @summary Make sure the Next/Prev Class links iterate through all types. 5.17 * Make sure the navagation is 2 columns, not 3. 5.18 * @author jamieh 5.19 @@ -45,20 +45,20 @@ 5.20 5.21 //Input for string search tests. 5.22 private static final String[][] TEST = { 5.23 - {BUG_ID + FS + "pkg" + FS + "A.html", "<li>PREV CLASS</li>"}, 5.24 + {BUG_ID + FS + "pkg" + FS + "A.html", "<li>Prev Class</li>"}, 5.25 {BUG_ID + FS + "pkg" + FS + "A.html", 5.26 - "<a href=\"../pkg/C.html\" title=\"class in pkg\"><span class=\"strong\">NEXT CLASS</span></a>"}, 5.27 + "<a href=\"../pkg/C.html\" title=\"class in pkg\"><span class=\"strong\">Next Class</span></a>"}, 5.28 {BUG_ID + FS + "pkg" + FS + "C.html", 5.29 - "<a href=\"../pkg/A.html\" title=\"annotation in pkg\"><span class=\"strong\">PREV CLASS</span></a>"}, 5.30 + "<a href=\"../pkg/A.html\" title=\"annotation in pkg\"><span class=\"strong\">Prev Class</span></a>"}, 5.31 {BUG_ID + FS + "pkg" + FS + "C.html", 5.32 - "<a href=\"../pkg/E.html\" title=\"enum in pkg\"><span class=\"strong\">NEXT CLASS</span></a>"}, 5.33 + "<a href=\"../pkg/E.html\" title=\"enum in pkg\"><span class=\"strong\">Next Class</span></a>"}, 5.34 {BUG_ID + FS + "pkg" + FS + "E.html", 5.35 - "<a href=\"../pkg/C.html\" title=\"class in pkg\"><span class=\"strong\">PREV CLASS</span></a>"}, 5.36 + "<a href=\"../pkg/C.html\" title=\"class in pkg\"><span class=\"strong\">Prev Class</span></a>"}, 5.37 {BUG_ID + FS + "pkg" + FS + "E.html", 5.38 - "<a href=\"../pkg/I.html\" title=\"interface in pkg\"><span class=\"strong\">NEXT CLASS</span></a>"}, 5.39 + "<a href=\"../pkg/I.html\" title=\"interface in pkg\"><span class=\"strong\">Next Class</span></a>"}, 5.40 {BUG_ID + FS + "pkg" + FS + "I.html", 5.41 - "<a href=\"../pkg/E.html\" title=\"enum in pkg\"><span class=\"strong\">PREV CLASS</span></a>"}, 5.42 - {BUG_ID + FS + "pkg" + FS + "I.html", "<li>NEXT CLASS</li>"}, 5.43 + "<a href=\"../pkg/E.html\" title=\"enum in pkg\"><span class=\"strong\">Prev Class</span></a>"}, 5.44 + {BUG_ID + FS + "pkg" + FS + "I.html", "<li>Next Class</li>"}, 5.45 // Test for 4664607 5.46 {BUG_ID + FS + "pkg" + FS + "I.html", 5.47 "<a href=\"#skip-navbar_top\" title=\"Skip navigation links\"></a><a name=\"navbar_top_firstrow\">" + NL +
6.1 --- a/test/com/sun/javadoc/testNewLanguageFeatures/TestNewLanguageFeatures.java Fri Mar 18 11:00:10 2011 -0700 6.2 +++ b/test/com/sun/javadoc/testNewLanguageFeatures/TestNewLanguageFeatures.java Tue Mar 22 18:32:41 2011 -0700 6.3 @@ -1,5 +1,5 @@ 6.4 /* 6.5 - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. 6.6 + * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. 6.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 6.8 * 6.9 * This code is free software; you can redistribute it and/or modify it 6.10 @@ -23,7 +23,7 @@ 6.11 6.12 /* 6.13 * @test 6.14 - * @bug 4789689 4905985 4927164 4827184 4993906 5004549 6.15 + * @bug 4789689 4905985 4927164 4827184 4993906 5004549 7025314 6.16 * @summary Run Javadoc on a set of source files that demonstrate new 6.17 * language features. Check the output to ensure that the new 6.18 * language features are properly documented. 6.19 @@ -155,14 +155,14 @@ 6.20 //================================= 6.21 //Make sure the summary links are correct. 6.22 {BUG_ID + FS + "pkg" + FS + "AnnotationType.html", 6.23 - "<li>SUMMARY: </li>" + NL + 6.24 + "<li>Summary: </li>" + NL + 6.25 "<li><a href=\"#annotation_type_required_element_summary\">" + 6.26 - "REQUIRED</a> | </li>" + NL + "<li>" + 6.27 - "<a href=\"#annotation_type_optional_element_summary\">OPTIONAL</a></li>"}, 6.28 + "Required</a> | </li>" + NL + "<li>" + 6.29 + "<a href=\"#annotation_type_optional_element_summary\">Optional</a></li>"}, 6.30 //Make sure the detail links are correct. 6.31 {BUG_ID + FS + "pkg" + FS + "AnnotationType.html", 6.32 - "<li>DETAIL: </li>" + NL + 6.33 - "<li><a href=\"#annotation_type_element_detail\">ELEMENT</a></li>"}, 6.34 + "<li>Detail: </li>" + NL + 6.35 + "<li><a href=\"#annotation_type_element_detail\">Element</a></li>"}, 6.36 //Make sure the heading is correct. 6.37 {BUG_ID + FS + "pkg" + FS + "AnnotationType.html", 6.38 "Annotation Type AnnotationType</h2>"},
