diff options
author | snowleo <schneeleo@gmail.com> | 2013-04-06 04:02:15 +0200 |
---|---|---|
committer | snowleo <schneeleo@gmail.com> | 2013-04-06 04:05:37 +0200 |
commit | fd1c7f4fccad0367e14e591fe13e674da241cc90 (patch) | |
tree | a20690539458d58f44f9e3048774abef0ee73bd0 /EssentialsGeoIP/src/net/ess3 | |
parent | d17d7153dc50ed856f3f93396928fd188ff95029 (diff) | |
download | Essentials-fd1c7f4fccad0367e14e591fe13e674da241cc90.tar Essentials-fd1c7f4fccad0367e14e591fe13e674da241cc90.tar.gz Essentials-fd1c7f4fccad0367e14e591fe13e674da241cc90.tar.lz Essentials-fd1c7f4fccad0367e14e591fe13e674da241cc90.tar.xz Essentials-fd1c7f4fccad0367e14e591fe13e674da241cc90.zip |
Moving all default messages back to the code, where they should be
Also tweaking I18n class and YamlStorageWriter a bit
Diffstat (limited to 'EssentialsGeoIP/src/net/ess3')
-rw-r--r-- | EssentialsGeoIP/src/net/ess3/geoip/EssentialsGeoIP.java | 2 | ||||
-rw-r--r-- | EssentialsGeoIP/src/net/ess3/geoip/EssentialsGeoIPPlayerListener.java | 18 |
2 files changed, 10 insertions, 10 deletions
diff --git a/EssentialsGeoIP/src/net/ess3/geoip/EssentialsGeoIP.java b/EssentialsGeoIP/src/net/ess3/geoip/EssentialsGeoIP.java index fe3b68275..fc0854870 100644 --- a/EssentialsGeoIP/src/net/ess3/geoip/EssentialsGeoIP.java +++ b/EssentialsGeoIP/src/net/ess3/geoip/EssentialsGeoIP.java @@ -18,7 +18,7 @@ public class EssentialsGeoIP extends JavaPlugin final IEssentials ess = (IEssentials)plugin.getEssentials(); if (!this.getDescription().getVersion().equals(plugin.getDescription().getVersion())) { - getLogger().log(Level.WARNING, _("versionMismatchAll")); + getLogger().log(Level.WARNING, _("Version mismatch! Please update all Essentials jars to the same version.")); } if (!plugin.isEnabled()) { diff --git a/EssentialsGeoIP/src/net/ess3/geoip/EssentialsGeoIPPlayerListener.java b/EssentialsGeoIP/src/net/ess3/geoip/EssentialsGeoIPPlayerListener.java index c305c024f..582c0f95a 100644 --- a/EssentialsGeoIP/src/net/ess3/geoip/EssentialsGeoIPPlayerListener.java +++ b/EssentialsGeoIP/src/net/ess3/geoip/EssentialsGeoIPPlayerListener.java @@ -94,7 +94,7 @@ public class EssentialsGeoIPPlayerListener implements Listener, IReload } if (Permissions.GEOIP_SHOW.isAuthorized(player)) { - player.sendMessage(_("geoipJoinFormat", player.getDisplayName(), builder.toString())); + player.sendMessage(_("Player {0} comes from {1}", player.getDisplayName(), builder.toString())); } } } @@ -127,7 +127,7 @@ public class EssentialsGeoIPPlayerListener implements Listener, IReload } else { - LOGGER.log(Level.SEVERE, _("cantFindGeoIpDB")); + LOGGER.log(Level.SEVERE, _("Can't find GeoIP database!")); return; } } @@ -137,7 +137,7 @@ public class EssentialsGeoIPPlayerListener implements Listener, IReload } catch (IOException ex) { - LOGGER.log(Level.SEVERE, _("cantReadGeoIpDB"), ex); + LOGGER.log(Level.SEVERE, _("Failed to read GeoIP database!"), ex); } } @@ -145,7 +145,7 @@ public class EssentialsGeoIPPlayerListener implements Listener, IReload { if (url == null || url.isEmpty()) { - LOGGER.log(Level.SEVERE, _("geoIpUrlEmpty")); + LOGGER.log(Level.SEVERE, _("GeoIP download url is empty.")); return; } if (!databaseFile.getAbsoluteFile().getParentFile().exists()) @@ -156,7 +156,7 @@ public class EssentialsGeoIPPlayerListener implements Listener, IReload OutputStream output = null; try { - LOGGER.log(Level.INFO, _("downloadingGeoIp")); + LOGGER.log(Level.INFO, _("Downloading GeoIP database ... this might take a while (country: 0.6 MB, city: 20MB)")); final URL downloadUrl = new URL(url); final URLConnection conn = downloadUrl.openConnection(); conn.setConnectTimeout(10000); @@ -179,11 +179,11 @@ public class EssentialsGeoIPPlayerListener implements Listener, IReload } catch (MalformedURLException ex) { - LOGGER.log(Level.SEVERE, _("geoIpUrlInvalid"), ex); + LOGGER.log(Level.SEVERE, _("GeoIP download url is invalid."), ex); } catch (IOException ex) { - LOGGER.log(Level.SEVERE, _("connectionFailed"), ex); + LOGGER.log(Level.SEVERE, _("Failed to open connection."), ex); } finally { @@ -195,7 +195,7 @@ public class EssentialsGeoIPPlayerListener implements Listener, IReload } catch (IOException ex) { - LOGGER.log(Level.SEVERE, _("connectionFailed"), ex); + LOGGER.log(Level.SEVERE, _("Failed to open connection."), ex); } } if (input != null) @@ -206,7 +206,7 @@ public class EssentialsGeoIPPlayerListener implements Listener, IReload } catch (IOException ex) { - LOGGER.log(Level.SEVERE, _("connectionFailed"), ex); + LOGGER.log(Level.SEVERE, _("Failed to open connection."), ex); } } } |