LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v0.3.4: added some safety checking and support for superclass strings

Browse Source
This commit is contained in:
Evan Debenham 2015-12-29 00:07:52 -05:00 committed by Evan Debenham
parent 44cead2244
commit c3b964a8cc
1 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/com/shatteredpixel/shatteredpixeldungeon/messages/Messages.java
View File

@ -21,6 +21,7 @@
package com.shatteredpixel.shatteredpixeldungeon.messages;
import java.util.Locale;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
public class Messages {
@ -45,8 +46,30 @@ public class Messages {
key += "." + k;
} else
key = k;
if (android.os.Build.VERSION.SDK_INT >= 9 && !strings.containsKey(key.toLowerCase())){
//this is so child classes can inherit properties from their parents.
//in cases where text is commonly grabbed as a utility from classes that aren't mean to be instantiated
//(e.g. flavourbuff.dispTurns()) using .class directly is probably smarter to prevent unnecessary recursive calls.
if (c != null && c.getSuperclass() != null){
return get(c.getSuperclass(), k, args);
} else {
return "!!!NO TEXT FOUND!!!";
}
} else {
try {
if (args.length > 0) return String.format(Locale.ENGLISH, strings.getString(key.toLowerCase()), args);
else return strings.getString(key.toLowerCase());
} catch (MissingResourceException e) {
//This silly catch block exists because android 2.2 does not support bundle.containsKey.
//This should only ever trigger on 2.2 devices
if (c != null && c.getSuperclass() != null){
return get(c.getSuperclass(), k, args);
} else {
return "!!!NO TEXT FOUND!!!";
}
}
}
}
}