From d076bf84e8562eea0c3495b09a92e8537858bf7e Mon Sep 17 00:00:00 2001 From: Andrzej Kapolka Date: Thu, 27 Jan 2011 01:08:05 +0000 Subject: [PATCH] Check for a locale-specific resource in getResourceFile. git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@1118 ed5b42cb-e716-0410-a449-f6a68f950b19 --- .../java/com/threerings/resource/ResourceManager.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/main/java/com/threerings/resource/ResourceManager.java b/src/main/java/com/threerings/resource/ResourceManager.java index d1c8fcbb..baf30f8a 100644 --- a/src/main/java/com/threerings/resource/ResourceManager.java +++ b/src/main/java/com/threerings/resource/ResourceManager.java @@ -30,6 +30,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; import java.util.List; +import java.util.Locale; import java.util.Map; import java.util.Properties; import java.util.Set; @@ -393,6 +394,13 @@ public class ResourceManager if (!"/".equals(File.separator)) { path = path.replace("/", File.separator); } + // first try a locale-specific file + if (_localePrefix != null) { + File file = new File(_rdir, PathUtil.appendPath(_localePrefix, path)); + if (file.exists()) { + return file; + } + } return new File(_rdir, path); }