Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

strings' externalization - simple step to multi-lingual options help #22

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/main/java/joptsimple/BuiltinHelpFormatter.java
Expand Up @@ -46,9 +46,9 @@ class BuiltinHelpFormatter implements HelpFormatter {


public String format( Map<String, ? extends OptionDescriptor> options ) { public String format( Map<String, ? extends OptionDescriptor> options ) {
if ( options.isEmpty() ) if ( options.isEmpty() )
return "No options specified"; return Messages.getString( "BuiltinHelpFormatter.noOptionsSpecified" );


grid = new ColumnarData( optionHeader( options ), "Description" ); grid = new ColumnarData( optionHeader( options ), Messages.getString( "BuiltinHelpFormatter.description" ) );


Comparator<OptionDescriptor> comparator = Comparator<OptionDescriptor> comparator =
new Comparator<OptionDescriptor>() { new Comparator<OptionDescriptor>() {
Expand All @@ -69,10 +69,10 @@ public int compare( OptionDescriptor first, OptionDescriptor second ) {
private String optionHeader( Map<String, ? extends OptionDescriptor> options ) { private String optionHeader( Map<String, ? extends OptionDescriptor> options ) {
for ( OptionDescriptor each : options.values() ) { for ( OptionDescriptor each : options.values() ) {
if ( each.isRequired() ) if ( each.isRequired() )
return "Option (* = required)"; return Messages.getString( "BuiltinHelpFormatter.optionRequired" );
} }


return "Option"; return Messages.getString( "BuiltinHelpFormatter.option" );
} }


private void addHelpLineFor( OptionDescriptor descriptor ) { private void addHelpLineFor( OptionDescriptor descriptor ) {
Expand Down Expand Up @@ -131,7 +131,7 @@ private String createDescriptionDisplay( OptionDescriptor descriptor ) {
return descriptor.description(); return descriptor.description();


String defaultValuesDisplay = createDefaultValuesDisplay( defaultValues ); String defaultValuesDisplay = createDefaultValuesDisplay( defaultValues );
return descriptor.description() + ' ' + surround( "default: " + defaultValuesDisplay, '(', ')' ); return descriptor.description() + ' ' + surround( Messages.getString( "BuiltinHelpFormatter.default" ) + defaultValuesDisplay, '(', ')' );
} }


private String createDefaultValuesDisplay( List<?> defaultValues ) { private String createDefaultValuesDisplay( List<?> defaultValues ) {
Expand Down
22 changes: 22 additions & 0 deletions src/main/java/joptsimple/Messages.java
@@ -0,0 +1,22 @@
package joptsimple;

import java.util.Locale;
import java.util.MissingResourceException;
import java.util.ResourceBundle;

public class Messages {
private static final String BUNDLE_NAME = "joptsimple.messages";

private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle( BUNDLE_NAME, Locale.getDefault() );

private Messages() {
}

public static String getString( String key ) {
try {
return RESOURCE_BUNDLE.getString( key );
} catch ( MissingResourceException e ) {
return '!' + key + '!';
}
}
}
5 changes: 5 additions & 0 deletions src/main/java/joptsimple/messages.properties
@@ -0,0 +1,5 @@
BuiltinHelpFormatter.default=default:
BuiltinHelpFormatter.description=Description
BuiltinHelpFormatter.noOptionsSpecified=No options specified
BuiltinHelpFormatter.option=Option
BuiltinHelpFormatter.optionRequired=Option (* = required)
5 changes: 5 additions & 0 deletions src/main/java/joptsimple/messages_en_US.properties
@@ -0,0 +1,5 @@
BuiltinHelpFormatter.default=default:
BuiltinHelpFormatter.description=Description
BuiltinHelpFormatter.noOptionsSpecified=No options specified
BuiltinHelpFormatter.option=Option
BuiltinHelpFormatter.optionRequired=Option (* = required)
5 changes: 5 additions & 0 deletions src/main/java/joptsimple/messages_pl_PL.properties
@@ -0,0 +1,5 @@
BuiltinHelpFormatter.default=domy\u015Blnie:
BuiltinHelpFormatter.description=Opis
BuiltinHelpFormatter.noOptionsSpecified=Brak opcji
BuiltinHelpFormatter.option=Opcja
BuiltinHelpFormatter.optionRequired=Opcja (* = wymagana)