TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-02-12 04:20:41 +00:00
Code Issues Projects Releases Wiki Activity

More translation stuff.

Browse source 
Check if the version of a translation file is up to date with essentials version.

git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1480 e251c2fe-e539-e718-e476-b85c1f46cddb
This commit is contained in:
snowleo 2011-05-15 13:18:38 +00:00
parent c51612d998
commit 0e0cfbb15b
5 changed files with 25 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Essentials/src/com/earth2me/essentials/Util.java
View file

@ -1,8 +1,10 @@
package com.earth2me.essentials; package com.earth2me.essentials;
import java.io.BufferedReader;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.net.MalformedURLException; import java.net.MalformedURLException;
@ -15,6 +17,8 @@ import java.util.Enumeration;
import java.util.GregorianCalendar; import java.util.GregorianCalendar;
import java.util.Locale; import java.util.Locale;
import java.util.ResourceBundle; import java.util.ResourceBundle;
import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import org.bukkit.Location; import org.bukkit.Location;
@ -331,9 +335,15 @@ public class Util
{ {
try try
{ {
BufferedReader br = new BufferedReader(new FileReader(file));
String version = br.readLine();
if (version == null || !version.equals("#version: "+Essentials.getStatic().getDescription().getVersion())) {
Logger.getLogger("Minecraft").log(Level.WARNING, "Translation file "+file+" is not updated for Essentials version. Will use default.");
return cl.getResourceAsStream(string);
}
return new FileInputStream(file); return new FileInputStream(file);
} }
catch (FileNotFoundException ex) catch (IOException ex)
{ {
return cl.getResourceAsStream(string); return cl.getResourceAsStream(string);
} }

8
Essentials/src/com/earth2me/essentials/commands/Commandmsg.java
View file

@ -32,9 +32,9 @@ public class Commandmsg extends EssentialsCommand
if (args[0].equalsIgnoreCase(Console.NAME)) if (args[0].equalsIgnoreCase(Console.NAME))
{ {
sender.sendMessage("[" + translatedMe + " -> " + Console.NAME + "§f] " + message); sender.sendMessage(Util.format("msgFormat", translatedMe, Console.NAME, message));
CommandSender cs = Console.getCommandSender(server); CommandSender cs = Console.getCommandSender(server);
cs.sendMessage("[" + senderName + " -> " + translatedMe + "§f] " + message); cs.sendMessage(Util.format("msgFormat", senderName, translatedMe, message));
replyTo.setReplyTo(cs); replyTo.setReplyTo(cs);
Console.getConsoleReplyTo().setReplyTo(sender); Console.getConsoleReplyTo().setReplyTo(sender);
return; return;
@ -55,8 +55,8 @@ public class Commandmsg extends EssentialsCommand
{ {
continue; continue;
} }
sender.sendMessage("[" + translatedMe + " -> " + p.getDisplayName() + "§f] " + message); sender.sendMessage(Util.format("msgFormat", translatedMe, p.getDisplayName(), message));
p.sendMessage("[" + senderName + " -> " + translatedMe + "§f] " + message); p.sendMessage(Util.format("msgFormat", senderName, translatedMe, message));
replyTo.setReplyTo(ess.getUser(p)); replyTo.setReplyTo(ess.getUser(p));
ess.getUser(p).setReplyTo(sender); ess.getUser(p).setReplyTo(sender);
} }

4
Essentials/src/com/earth2me/essentials/commands/Commandr.java
View file

@ -36,7 +36,7 @@ public class Commandr extends EssentialsCommand
} }
charge(sender); charge(sender);
sender.sendMessage("[" + Util.i18n("me")+ " -> " + targetName + "] " + message); sender.sendMessage(Util.format("msgFormat", Util.i18n("me"), targetName, message));
if (target instanceof Player) if (target instanceof Player)
{ {
User u = ess.getUser(target); User u = ess.getUser(target);
@ -45,7 +45,7 @@ public class Commandr extends EssentialsCommand
return; return;
} }
} }
target.sendMessage("[" + senderName + " -> " + Util.i18n("me") +"] " + message); target.sendMessage(Util.format("msgFormat", senderName, Util.i18n("me"), message));
replyTo.setReplyTo(target); replyTo.setReplyTo(target);
if (target != sender) if (target != sender)
{ {

3
Essentials/src/messages.properties
View file

@ -1,3 +1,5 @@
#version: TeamCity
# Translations start here
loadinfo = Loaded {0} build {1} by {2} loadinfo = Loaded {0} build {1} by {2}
markedAsNotAway = \u00a77You are no longer marked as away. markedAsNotAway = \u00a77You are no longer marked as away.
markedAsAway = \u00a77You are now marked as away. markedAsAway = \u00a77You are now marked as away.
@ -304,3 +306,4 @@ unignorePlayer = You are not ignoring player {0} anymore.
ignorePlayer = You ignore player {0} from now on. ignorePlayer = You ignore player {0} from now on.
illegalDate = Illegal date format. illegalDate = Illegal date format.
timePattern = (?:([0-9]+)\\s*y[a-z]*[,\\s]*)?(?:([0-9]+)\\s*mo[a-z]*[,\\s]*)?(?:([0-9]+)\\s*w[a-z]*[,\\s]*)?(?:([0-9]+)\\s*d[a-z]*[,\\s]*)?(?:([0-9]+)\\s*h[a-z]*[,\\s]*)?(?:([0-9]+)\\s*m[a-z]*[,\\s]*)?(?:([0-9]+)\\s*(?:s[a-z]*)?)? timePattern = (?:([0-9]+)\\s*y[a-z]*[,\\s]*)?(?:([0-9]+)\\s*mo[a-z]*[,\\s]*)?(?:([0-9]+)\\s*w[a-z]*[,\\s]*)?(?:([0-9]+)\\s*d[a-z]*[,\\s]*)?(?:([0-9]+)\\s*h[a-z]*[,\\s]*)?(?:([0-9]+)\\s*m[a-z]*[,\\s]*)?(?:([0-9]+)\\s*(?:s[a-z]*)?)?
msgFormat = [{0} -> {1}\u00a7f] {2}

3
Essentials/src/messages_de.properties
View file

@ -1,3 +1,5 @@
#version: TeamCity
# Translations start here
loadinfo = Plugin {0} Version {1} geladen, erstellt von {2}, \u00fcbersetzt von snowleo loadinfo = Plugin {0} Version {1} geladen, erstellt von {2}, \u00fcbersetzt von snowleo
markedAsNotAway = \u00a77Du wirst nicht mehr als abwesend angezeigt. markedAsNotAway = \u00a77Du wirst nicht mehr als abwesend angezeigt.
markedAsAway = \u00a77Du wirst als abwesend angezeigt. markedAsAway = \u00a77Du wirst als abwesend angezeigt.
@ -304,3 +306,4 @@ unignorePlayer = You are not ignoring player {0} anymore.
ignorePlayer = You ignore player {0} from now on. ignorePlayer = You ignore player {0} from now on.
illegalDate = Illegal date format. illegalDate = Illegal date format.
timePattern = (?:([0-9]+)\\s*[yj][a-z]*[,\\s]*)?(?:([0-9]+)\\s*mo[a-z]*[,\\s]*)?(?:([0-9]+)\\s*w[a-z]*[,\\s]*)?(?:([0-9]+)\\s*[dt][a-z]*[,\\s]*)?(?:([0-9]+)\\s*(?:h|st)[a-z]*[,\\s]*)?(?:([0-9]+)\\s*m[a-z]*[,\\s]*)?(?:([0-9]+)\\s*(?:s[a-z]*)?)? timePattern = (?:([0-9]+)\\s*[yj][a-z]*[,\\s]*)?(?:([0-9]+)\\s*mo[a-z]*[,\\s]*)?(?:([0-9]+)\\s*w[a-z]*[,\\s]*)?(?:([0-9]+)\\s*[dt][a-z]*[,\\s]*)?(?:([0-9]+)\\s*(?:h|st)[a-z]*[,\\s]*)?(?:([0-9]+)\\s*m[a-z]*[,\\s]*)?(?:([0-9]+)\\s*(?:s[a-z]*)?)?
msgFormat = [{0} -> {1}\u00a7f] {2}