X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Foutput%2FBasicOutput.java;h=babe7537021058438071537dae41fbed948e2e0c;hb=4d2056837eaad81199dfb2fbd727e65440371889;hp=5e82f253c37e47cd535faea739d69f83c4940cd2;hpb=3b2b638f7e1395702f843b5b19d7959327f604b2;p=nikiroo-utils.git

diff --git a/src/be/nikiroo/fanfix/output/BasicOutput.java b/src/be/nikiroo/fanfix/output/BasicOutput.java
index 5e82f25..babe753 100644
--- a/src/be/nikiroo/fanfix/output/BasicOutput.java
+++ b/src/be/nikiroo/fanfix/output/BasicOutput.java
@@ -52,15 +52,19 @@ public abstract class BasicOutput {
 		/**
 		 * A description of this output type.
 		 * 
+		 * @param longDesc
+		 *            TRUE for the long description, FALSE for the short one
+		 * 
 		 * @return the description
 		 */
-		public String getDesc() {
-			String desc = Instance.getTrans().getStringX(StringId.OUTPUT_DESC,
-					this.name());
+		public String getDesc(boolean longDesc) {
+			StringId id = longDesc ? StringId.OUTPUT_DESC
+					: StringId.OUTPUT_DESC_SHORT;
+
+			String desc = Instance.getTrans().getStringX(id, this.name());
 
 			if (desc == null) {
-				desc = Instance.getTrans()
-						.getString(StringId.OUTPUT_DESC, this);
+				desc = Instance.getTrans().getString(id, this);
 			}
 
 			return desc;
@@ -69,12 +73,17 @@ public abstract class BasicOutput {
 		/**
 		 * The default extension to add to the output files.
 		 * 
+		 * @param readerTarget
+		 *            the target to point to to read the {@link Story} (for
+		 *            instance, the main entry point if this {@link Story} is in
+		 *            a directory bundle)
+		 * 
 		 * @return the extension
 		 */
-		public String getDefaultExtension() {
+		public String getDefaultExtension(boolean readerTarget) {
 			BasicOutput output = BasicOutput.getOutput(this, false);
 			if (output != null) {
-				return output.getDefaultExtension();
+				return output.getDefaultExtension(readerTarget);
 			}
 
 			return null;
@@ -166,7 +175,7 @@ public abstract class BasicOutput {
 		File targetDir = new File(target).getParentFile();
 		String targetName = new File(target).getName();
 
-		String ext = getDefaultExtension();
+		String ext = getDefaultExtension(false);
 		if (ext != null && !ext.isEmpty()) {
 			if (targetName.toLowerCase().endsWith(ext)) {
 				targetName = targetName.substring(0,
@@ -239,9 +248,14 @@ public abstract class BasicOutput {
 	/**
 	 * The default extension to add to the output files.
 	 * 
+	 * @param readerTarget
+	 *            the target to point to to read the {@link Story} (for
+	 *            instance, the main entry point if this {@link Story} is in a
+	 *            directory bundle)
+	 * 
 	 * @return the extension
 	 */
-	public String getDefaultExtension() {
+	public String getDefaultExtension(boolean readerTarget) {
 		return "";
 	}