summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKHobbits <rob@khobbits.co.uk>2012-03-25 19:10:39 +0100
committerKHobbits <rob@khobbits.co.uk>2012-03-25 19:10:39 +0100
commit47cf1289d7baa72b318ecc444102dfe234c98e75 (patch)
treebbcfa2c53f02d3a5835b9a9483f4f6f4b9277c00
parentd2506cd928125c44023c6e4baed2d76f661aff21 (diff)
downloadEssentials-47cf1289d7baa72b318ecc444102dfe234c98e75.tar
Essentials-47cf1289d7baa72b318ecc444102dfe234c98e75.tar.gz
Essentials-47cf1289d7baa72b318ecc444102dfe234c98e75.tar.lz
Essentials-47cf1289d7baa72b318ecc444102dfe234c98e75.tar.xz
Essentials-47cf1289d7baa72b318ecc444102dfe234c98e75.zip
Don't show 'backup started' on /backup if it hasn't been configured.
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandbackup.java7
-rw-r--r--Essentials/src/messages.properties1
-rw-r--r--Essentials/src/messages_da.properties1
-rw-r--r--Essentials/src/messages_de.properties1
-rw-r--r--Essentials/src/messages_en.properties1
-rw-r--r--Essentials/src/messages_es.properties1
-rw-r--r--Essentials/src/messages_fr.properties1
-rw-r--r--Essentials/src/messages_nl.properties1
8 files changed, 13 insertions, 1 deletions
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandbackup.java b/Essentials/src/com/earth2me/essentials/commands/Commandbackup.java
index 32c8c9e80..9a10100c0 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandbackup.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandbackup.java
@@ -19,7 +19,12 @@ public class Commandbackup extends EssentialsCommand
final Backup backup = ess.getBackup();
if (backup == null)
{
- throw new Exception();
+ throw new Exception(_("backupDisabled"));
+ }
+ final String command = ess.getSettings().getBackupCommand();
+ if (command == null || "".equals(command))
+ {
+ throw new Exception(_("backupDisabled"));
}
backup.run();
sender.sendMessage(_("backupStarted"));
diff --git a/Essentials/src/messages.properties b/Essentials/src/messages.properties
index ecaf691e6..7707ac09a 100644
--- a/Essentials/src/messages.properties
+++ b/Essentials/src/messages.properties
@@ -12,6 +12,7 @@ alertUsed=used:
autoAfkKickReason=You have been kicked for idling more than {0} minutes.
backAfterDeath=\u00a77Use the /back command to return to your death point.
backUsageMsg=\u00a77Returning to previous location.
+backupDisabled=An external backup script has not been configured.
backupFinished=Backup finished
backupStarted=Backup started
balance=\u00a77Balance: {0}
diff --git a/Essentials/src/messages_da.properties b/Essentials/src/messages_da.properties
index ec50806a6..e06985430 100644
--- a/Essentials/src/messages_da.properties
+++ b/Essentials/src/messages_da.properties
@@ -12,6 +12,7 @@ alertUsed=brugte:
autoAfkKickReason=Du er blevet kicked for at idle mere end {0} minutter.
backAfterDeath=\u00a77Brug /back kommandoen for at teleportere til dit d\u00f8dspunkt.
backUsageMsg=\u00a77Teleporterer til tidligere placering.
+backupDisabled=An external backup script has not been configured.
backupFinished=Backup sluttet
backupStarted=Backup startet
balance=\u00a77Saldo: {0}
diff --git a/Essentials/src/messages_de.properties b/Essentials/src/messages_de.properties
index 7f2c91b69..4e4f7e78d 100644
--- a/Essentials/src/messages_de.properties
+++ b/Essentials/src/messages_de.properties
@@ -12,6 +12,7 @@ alertUsed=benutzt:
autoAfkKickReason=Du wurdest gekickt, weil du f\u00fcr {0} Minuten inaktiv warst.
backAfterDeath=\u00a77Benutze den Befehl /back um zu deinem Todespunkt zur\u00fcck zu kehren.
backUsageMsg=\u00a77Kehre zur letzten Position zur\u00fcck.
+backupDisabled=An external backup script has not been configured.
backupFinished=Backup beendet
backupStarted=Backup gestartet
balance=\u00a77Geldb\u00f6rse: {0}
diff --git a/Essentials/src/messages_en.properties b/Essentials/src/messages_en.properties
index d56675209..34367f115 100644
--- a/Essentials/src/messages_en.properties
+++ b/Essentials/src/messages_en.properties
@@ -12,6 +12,7 @@ alertUsed=used:
autoAfkKickReason=You have been kicked for idling more than {0} minutes.
backAfterDeath=\u00a77Use the /back command to return to your death point.
backUsageMsg=\u00a77Returning to previous location.
+backupDisabled=An external backup script has not been configured.
backupFinished=Backup finished
backupStarted=Backup started
balance=\u00a77Balance: {0}
diff --git a/Essentials/src/messages_es.properties b/Essentials/src/messages_es.properties
index 3d32bf2d1..ad1aefe6c 100644
--- a/Essentials/src/messages_es.properties
+++ b/Essentials/src/messages_es.properties
@@ -12,6 +12,7 @@ alertUsed=usado:
autoAfkKickReason=Has sido echado por ausentarte mas de {0} minutos.
backAfterDeath=\u00a77Usa el comando /back para volver al punto en el que moriste.
backUsageMsg=\u00a77Volviendo a la localizacion anterior.
+backupDisabled=An external backup script has not been configured.
backupFinished=Copia de seguridad completada
backupStarted=Comenzando copia de seguridad
balance=\u00a77Cantidad: {0}
diff --git a/Essentials/src/messages_fr.properties b/Essentials/src/messages_fr.properties
index e4e370b90..0c4b94efc 100644
--- a/Essentials/src/messages_fr.properties
+++ b/Essentials/src/messages_fr.properties
@@ -12,6 +12,7 @@ alertUsed=a utilis\u00e9 :
autoAfkKickReason=Vous avez \u00e9t\u00e9 \u00e9ject\u00e9 pour inactivit\u00e9e sup\u00e9rieure \u00e0 {0} minutes.
backAfterDeath=\u00a77Utilisez la commande /back pour retourner \u00e0 l''endroit ou vous \u00eates mort.
backUsageMsg=\u00a77Retour \u00e0 votre emplacement pr\u00e9c\u00c3\u00a8dent.
+backupDisabled=An external backup script has not been configured.
backupFinished=Sauvegarde termin\u00e9
backupStarted=D\u00e9but de la sauvegarde...
balance=\u00a77Solde : {0}
diff --git a/Essentials/src/messages_nl.properties b/Essentials/src/messages_nl.properties
index 8d3a4cbd7..d0f56752b 100644
--- a/Essentials/src/messages_nl.properties
+++ b/Essentials/src/messages_nl.properties
@@ -12,6 +12,7 @@ alertUsed=gebruikt:
autoAfkKickReason=You have been kicked for idling more than {0} minutes.
backAfterDeath=\u00a77Gebruik het /back command om terug te keren naar je sterfplaats.
backUsageMsg=\u00a77Naar de vorige locatie aan het gaan.
+backupDisabled=An external backup script has not been configured.
backupFinished=Backup voltooid
backupStarted=Backup gestart
balance=\u00a77Saldo: {0}