Mercurial > projects > dwt2
diff base/src/java/util/ResourceBundle.d @ 114:46539f5c5993
Added implementation of ResourceBundle.
author | kntroh |
---|---|
date | Fri, 08 Apr 2011 20:12:20 +0900 |
parents | 9f4c18c268b2 |
children | 3daece18b48e |
line wrap: on
line diff
--- a/base/src/java/util/ResourceBundle.d Wed Apr 06 21:57:23 2011 +0200 +++ b/base/src/java/util/ResourceBundle.d Fri Apr 08 20:12:20 2011 +0900 @@ -8,10 +8,10 @@ import java.lang.exceptions; import java.util.MissingResourceException; import java.util.Enumeration; +import java.nonstandard.locale; version(Tango){ //import tango.text.Util; import tango.io.device.File; - import tango.text.locale.Core; } else { // Phobos import std.file; } @@ -25,32 +25,28 @@ + First entry is the default entry if no maching locale is found +/ public this( ImportData[] data ){ - version(Tango){ - char[] name = Culture.current().name.dup; - if( name.length is 5 && name[2] is '-' ){ - name[2] = '_'; - char[] end = "_" ~ name ~ ".properties"; - foreach( entry; data ){ - if( entry.name.length > end.length && entry.name[ $-end.length .. $ ] == end ){ - //Trace.formatln( "ResourceBundle {}", entry.name ); - initialize( cast(char[])entry.data ); - return; - } - } - } - char[] end = "_" ~ name[0..2] ~ ".properties"; + char[] name = caltureName.dup; + if( name.length is 5 && name[2] is '-' ){ + name[2] = '_'; + char[] end = "_" ~ name ~ ".properties"; foreach( entry; data ){ if( entry.name.length > end.length && entry.name[ $-end.length .. $ ] == end ){ //Trace.formatln( "ResourceBundle {}", entry.name ); - initialize( cast(char[])entry.data ); + initialize( cast(String)entry.data ); return; } } - //Trace.formatln( "ResourceBundle default" ); - initialize( cast(char[])data[0].data ); - } else { // Phobos - implMissing(__FILE__,__LINE__); } + char[] end = "_" ~ name[0..2] ~ ".properties"; + foreach( entry; data ){ + if( entry.name.length > end.length && entry.name[ $-end.length .. $ ] == end ){ + //Trace.formatln( "ResourceBundle {}", entry.name ); + initialize( cast(String)entry.data ); + return; + } + } + //Trace.formatln( "ResourceBundle default" ); + initialize( cast(String)data[0].data ); } public this( ImportData data ){ initialize( cast(String)data.data );