Renamed plain JSON option to flatten JSON. #41

Author: Jacob van Mourik

src/main/java/com/jvms/i18neditor/Main.java

@@ -21,6 +21,9 @@ public class Main {
 	private final static Logger log = LoggerFactory.getLogger(Main.class);
 
 	public static void main(String[] args) {
+		// Override locale for testing
+		//Locale.setDefault(new Locale("nl"));
+		
 		SwingUtilities.invokeLater(() -> {
 			// Enable global menu on MAC OS
 			if (SystemUtils.IS_OS_MAC) {

src/main/java/com/jvms/i18neditor/editor/Editor.java

@@ -216,7 +216,7 @@ public boolean saveProject() {
 		if (project != null) {
 			for (Resource resource : project.getResources()) {
 				try {
-					Resources.write(resource, !project.isMinifyResources(), project.isPlainJSON());
+					Resources.write(resource, !project.isMinifyResources(), project.isFlattenJSON());
 				} catch (IOException e) {
 					error = true;
 					log.error("Error saving resource file " + resource.getPath(), e);
@@ -850,7 +850,7 @@ private void updateTreeNodeStatus(String key) {
 	private void storeProjectState() {
 		ExtendedProperties props = new ExtendedProperties();
 		props.setProperty("minify_resources", project.isMinifyResources());
-		props.setProperty("plain_json", project.isPlainJSON());
+		props.setProperty("flatten_json", project.isFlattenJSON());
 		props.setProperty("resource_type", project.getResourceType().toString());
 		props.setProperty("resource_definition", project.getResourceFileDefinition());
 		props.setProperty("resource_directories", project.isUseResourceDirectories());
@@ -863,7 +863,7 @@ private void restoreProjectState(EditorProject project) {
 		if (Files.exists(path)) {
 			props.load(Paths.get(project.getPath().toString(), PROJECT_FILE));
 			project.setMinifyResources(props.getBooleanProperty("minify_resources", settings.isMinifyResources()));
-			project.setPlainJSON(props.getBooleanProperty("plain_json", settings.isPlainJSON()));
+			project.setFlattenJSON(props.getBooleanProperty("flatten_json", settings.isFlattenJSON()));
 			project.setResourceType(props.getEnumProperty("resource_type", ResourceType.class));
 			String resourceName = props.getProperty("resource_name"); // for backwards compatibility
 			if (Strings.isNullOrEmpty(resourceName)) {
@@ -875,7 +875,7 @@ private void restoreProjectState(EditorProject project) {
 			}
 		} else {
 			project.setMinifyResources(settings.isMinifyResources());
-			project.setPlainJSON(settings.isPlainJSON());
+			project.setFlattenJSON(settings.isFlattenJSON());
 			project.setResourceFileDefinition(settings.getResourceFileDefinition());
 			project.setUseResourceDirectories(settings.isUseResourceDirectories());
 		}
@@ -889,7 +889,7 @@ private void storeEditorState() {
 		props.setProperty("window_pos_y", getY());
 		props.setProperty("window_div_pos", contentPane.getDividerLocation());
 		props.setProperty("minify_resources", settings.isMinifyResources());
-		props.setProperty("plain_json", settings.isPlainJSON());
+		props.setProperty("flatten_json", settings.isFlattenJSON());
 		props.setProperty("resource_definition", settings.getResourceFileDefinition());
 		props.setProperty("resource_directories", settings.isUseResourceDirectories());
 		props.setProperty("check_version", settings.isCheckVersionOnStartup());
@@ -925,7 +925,7 @@ private void restoreEditorState() {
 		settings.setKeyFieldEnabled(props.getBooleanProperty("key_field_enabled", true));
 		settings.setDoubleClickTreeToggling(props.getBooleanProperty("double_click_tree_toggling", false));
 		settings.setMinifyResources(props.getBooleanProperty("minify_resources", false));
-		settings.setPlainJSON(props.getBooleanProperty("plain_json", false));
+		settings.setFlattenJSON(props.getBooleanProperty("flatten_json", false));
 		settings.setHistory(props.getListProperty("history"));
 		settings.setLastExpandedNodes(props.getListProperty("last_expanded"));
 		settings.setLastSelectedNode(props.getProperty("last_selected"));

src/main/java/com/jvms/i18neditor/editor/EditorProject.java

@@ -19,7 +19,7 @@ public class EditorProject {
 	private ResourceType resourceType;
 	private List<Resource> resources;
 	private boolean minifyResources;
-	private boolean plainJSON;
+	private boolean flattenJSON;
 	private boolean resourceDirectories;
 
 	public EditorProject(Path path) {
@@ -83,11 +83,11 @@ public void setMinifyResources(boolean minifyResources) {
 		this.minifyResources = minifyResources;
 	}
 
-	public boolean isPlainJSON() {
-		return plainJSON;
+	public boolean isFlattenJSON() {
+		return flattenJSON;
 	}
 
-	public void setPlainJSON(boolean plainJSON) {
-		this.plainJSON = plainJSON;
+	public void setFlattenJSON(boolean flattenJSON) {
+		this.flattenJSON = flattenJSON;
 	}
 }

src/main/java/com/jvms/i18neditor/editor/EditorProjectSettingsPane.java

@@ -43,10 +43,10 @@ private void setupUI() {
 		}
 
 		if (project.getResourceType().equals(ResourceType.JSON)) {
-			JCheckBox plainJSONBox = new JCheckBox(MessageBundle.get("settings.plainJSON.title"));
-			plainJSONBox.setSelected(project.isPlainJSON());
-			plainJSONBox.addChangeListener(e -> project.setPlainJSON(plainJSONBox.isSelected()));
-			fieldset1.add(plainJSONBox, createVerticalGridBagConstraints());
+			JCheckBox flattenJSONBox = new JCheckBox(MessageBundle.get("settings.flattenjson.title"));
+			flattenJSONBox.setSelected(project.isFlattenJSON());
+			flattenJSONBox.addChangeListener(e -> project.setFlattenJSON(flattenJSONBox.isSelected()));
+			fieldset1.add(flattenJSONBox, createVerticalGridBagConstraints());
 		}
 
 		JCheckBox useResourceDirsBox = new JCheckBox(MessageBundle.get("settings.resourcedirs.title"));

src/main/java/com/jvms/i18neditor/editor/EditorSettings.java

@@ -14,7 +14,7 @@ public class EditorSettings {
 	private int windowWidth;
 	private int windowHeight;
 	private boolean minifyResources;
-	private boolean plainJSON;
+	private boolean flattenJSON;
 	private List<String> history;
 	private List<String> lastExpandedNodes;
 	private String lastSelectedNode;
@@ -136,14 +136,6 @@ public boolean isDoubleClickTreeToggling() {
 	public void setDoubleClickTreeToggling(boolean doubleClickTreeToggling) {
 		this.doubleClickTreeToggling = doubleClickTreeToggling;
 	}
-
-	public boolean isPlainJSON() {
-		return plainJSON;
-	}
-
-	public void setPlainJSON(boolean plainJSON) {
-		this.plainJSON = plainJSON;
-	}
 
 	public boolean isUseResourceDirectories() {
 		return resourceDirectories;
@@ -152,4 +144,11 @@ public boolean isUseResourceDirectories() {
 	public void setUseResourceDirectories(boolean resourceDirectories) {
 		this.resourceDirectories = resourceDirectories;
 	}
+	public boolean isFlattenJSON() {
+		return flattenJSON;
+	}
+
+	public void setFlattenJSON(boolean flattenJSON) {
+		this.flattenJSON = flattenJSON;
+	}
 }

src/main/java/com/jvms/i18neditor/editor/EditorSettingsPane.java

@@ -48,6 +48,11 @@ private void setupUI() {
 		minifyBox.addChangeListener(e -> settings.setMinifyResources(minifyBox.isSelected()));		
 		fieldset2.add(minifyBox, createVerticalGridBagConstraints());
 
+		JCheckBox flattenJSONBox = new JCheckBox(MessageBundle.get("settings.flattenjson.title"));
+		flattenJSONBox.setSelected(settings.isFlattenJSON());
+		flattenJSONBox.addChangeListener(e -> settings.setFlattenJSON(flattenJSONBox.isSelected()));
+		fieldset2.add(flattenJSONBox, createVerticalGridBagConstraints());
+		
 		JCheckBox useResourceDirsBox = new JCheckBox(MessageBundle.get("settings.resourcedirs.title"));
 		useResourceDirsBox.setSelected(settings.isUseResourceDirectories());
 		useResourceDirsBox.addChangeListener(e -> settings.setUseResourceDirectories(useResourceDirsBox.isSelected()));		

src/main/java/com/jvms/i18neditor/editor/TranslationTreeNodeMenu.java

@@ -22,8 +22,8 @@ public TranslationTreeNodeMenu(Editor editor, TranslationTreeNode node) {
 		if (!node.isRoot()) {
 			addSeparator();
 			add(new RenameTranslationMenuItem(editor, true));
-			add(new CopyTranslationKeyToClipboardMenuItem(editor, true));
 			add(new DuplicateTranslationMenuItem(editor, true));
+			add(new CopyTranslationKeyToClipboardMenuItem(editor, true));
 			add(new RemoveTranslationMenuItem(editor, true));
 		}
 	}

src/main/java/com/jvms/i18neditor/util/Resources.java

@@ -137,7 +137,7 @@ public static void load(Resource resource) throws IOException {
 	 * @param 	plainKeys 
 	 * @throws 	IOException if an I/O error occurs writing the file.
 	 */
-	public static void write(Resource resource, boolean prettyPrinting, boolean plainKeys) throws IOException {
+	public static void write(Resource resource, boolean prettyPrinting, boolean flattenKeys) throws IOException {
 		if (resource.getChecksum() != null) {
 			String checksum = createChecksum(resource);
 			if (!checksum.equals(resource.getChecksum())) {
@@ -149,7 +149,7 @@ public static void write(Resource resource, boolean prettyPrinting, boolean plai
 			ExtendedProperties content = toProperties(resource.getTranslations());
 			content.store(resource.getPath());
 		} else {
-			String content = toJson(resource.getTranslations(), prettyPrinting, plainKeys);
+			String content = toJson(resource.getTranslations(), prettyPrinting, flattenKeys);
 			if (type == ResourceType.ES6) {
 				content = jsonToEs6(content);
 			}
@@ -233,28 +233,28 @@ private static void fromJson(String key, JsonElement elem, Map<String,String> co
 		}
 	}
 
-	private static String toJson(Map<String,String> translations, boolean prettify, boolean plainKeys) {
+	private static String toJson(Map<String,String> translations, boolean prettify, boolean flattenKeys) {
 		List<String> keys = Lists.newArrayList(translations.keySet());
-		JsonElement elem = !plainKeys ? toJson(translations, null, keys) : toPlainJson(translations, keys);
+		JsonElement elem = !flattenKeys ? toJson(translations, null, keys) : toFlatJson(translations, keys);
 		GsonBuilder builder = new GsonBuilder().disableHtmlEscaping();
 		if (prettify) {
 			builder.setPrettyPrinting();
 		}
 		return builder.create().toJson(elem);
 	}
 
-	private static JsonElement toPlainJson(Map<String, String> translations, List<String> keys) {
+	private static JsonElement toFlatJson(Map<String, String> translations, List<String> keys) {
 		JsonObject object = new JsonObject();
 		if (keys.size() > 0) {
 			translations.forEach((k, v) -> {
-				if (translations.get(k)!=null){
+				if (translations.get(k) != null){
 					object.add(k, new JsonPrimitive(translations.get(k)));
 				}
 			});			
 		}
 		return object;
 	}
-
+	
 	private static JsonElement toJson(Map<String,String> translations, String key, List<String> keys) {
 		if (keys.size() > 0) {
 			JsonObject object = new JsonObject();

src/main/resources/bundles/messages.properties

@@ -20,14 +20,14 @@ dialogs.translation.add.text = Enter translation key:
 dialogs.translation.add.title = Add Translation
 dialogs.translation.conflict.text.replace = There already exists a translation with this key, do you want to replace it?
 dialogs.translation.conflict.text.merge = There already exists a translation with this key, do you want to merge it?
-dialogs.translation.conflict.title = Translation conflict
-dialogs.translation.duplicate.error = The key you entered is invalid.
+dialogs.translation.conflict.title = Conflict
+dialogs.translation.duplicate.error = The entered value is invalid.
 dialogs.translation.duplicate.text = Enter new key:
 dialogs.translation.duplicate.title = Duplicate Translation
 dialogs.translation.find.error = No translation found.
 dialogs.translation.find.text = Enter translation key:
 dialogs.translation.find.title = Find Translation
-dialogs.translation.rename.error = The key you entered is invalid.
+dialogs.translation.rename.error = The entered value is invalid.
 dialogs.translation.rename.text = Enter new key:
 dialogs.translation.rename.title = Rename Translation
 dialogs.version.link = Click here to download
@@ -41,7 +41,7 @@ menu.edit.delete.title = Delete Translation
 menu.edit.duplicate.title = Duplicate Translation...
 menu.edit.find.translation.title = Find Translation...
 menu.edit.rename.title = Rename Translation...
-menu.edit.copy.key.title = Copy Translation Key...
+menu.edit.copy.key.title = Copy Translation Key
 menu.edit.title = Edit
 menu.edit.vk = E
 menu.file.exit.title = Exit
@@ -71,8 +71,8 @@ menu.settings.preferences.editor.title = Preferences...
 menu.settings.preferences.project.title = Project Preferences...
 menu.settings.title = Settings
 menu.settings.vk = S
-menu.view.collapse.title = Collapse All Translations
-menu.view.expand.title = Expand All Translations
+menu.view.collapse.title = Collapse All Translation Keys
+menu.view.expand.title = Expand All Translation Keys
 menu.view.title = View
 menu.view.vk = V
 
@@ -88,13 +88,14 @@ settings.fieldset.general = General
 settings.fieldset.newprojects = New Projects
 settings.inputheight.title = Default height of input fields
 settings.keyfield.title = Show translation key field
-settings.minify.title = Minify translations on save
+settings.minify.title = Minify translation files on save
 settings.resourcedef.help = <html>You can use '{' '}' tags to specify the locale part within the filename.<br>The text LOCALE within this tags will be replaced by the actual locale.<br>Example: translations'{'_LOCALE'}' will become translations_en_US.</html>
 settings.resourcedef.title = Translations filename
-settings.resourcedirs.title = Save translation files in separate folders
-settings.treetogglemode.title = Expand and collapse translations using double click
+settings.resourcedirs.title = Store translation files in separate folders
+settings.treetogglemode.title = Expand and collapse translation keys using double click
 settings.checkversion.title = Check for new version on startup
-settings.plainJSON.title= Plain JSON keys
+settings.flattenjson.title = Flatten JSON translation files on save
+
 swing.action.copy = Copy
 swing.action.cut = Cut
 swing.action.delete = Delete

src/main/resources/bundles/messages_nl.properties

@@ -3,10 +3,10 @@ core.intro.text = Sleep een bestaand project hierheen of ga naar Bestand\ufe65Ni
 
 dialogs.about.title = Over {0}
 dialogs.error.title = Fout
-dialogs.locale.add.error.create = Er is iets fout gegaan bij het toevoegen van de nieuwe locale.
-dialogs.locale.add.error.invalid = De opgegeven locale is niet geldig of bestaat al.
-dialogs.locale.add.text = Locale (bijv. nl_NL):
-dialogs.locale.add.title = Locale Toevoegen
+dialogs.locale.add.error.create = Er is iets fout gegaan bij het toevoegen van de nieuwe taal.
+dialogs.locale.add.error.invalid = De opgegeven taal is niet geldig of bestaat al.
+dialogs.locale.add.text = Taal (bijv. nl_NL):
+dialogs.locale.add.title = Taal Toevoegen
 dialogs.preferences.editor.title = Voorkeuren
 dialogs.preferences.project.title = Projectvoorkeuren
 dialogs.project.import.title = Importeer Project
@@ -15,33 +15,33 @@ dialogs.project.new.conflict.title = Conflict
 dialogs.project.new.title = Nieuw Project
 dialogs.save.text = U heeft nog onopgeslagen wijzigingen, wilt u deze opslaan?
 dialogs.save.title = Vertalingen Opslaan
-dialogs.translation.add.error = De opgegeven key voor de vertaling is niet geldig.
-dialogs.translation.add.text = Key voor de vertaling:
+dialogs.translation.add.error = De opgegeven vertaalsleutel is niet geldig.
+dialogs.translation.add.text = Vertaalsleutel:
 dialogs.translation.add.title = Vertaling Toevoegen
-dialogs.translation.conflict.text.replace = Er bestaat al een vertaling met deze key, wilt u deze vervangen?
-dialogs.translation.conflict.text.merge = Er bestaat al een vertaling met deze key, wilt u deze samenvoegen?
-dialogs.translation.conflict.title = Vertalingsconflict
-dialogs.translation.duplicate.error = De opgegeven key is niet geldig.
+dialogs.translation.conflict.text.replace = Er bestaat al een vertaling met deze vertaalsleutel, wilt u deze vervangen?
+dialogs.translation.conflict.text.merge = Er bestaat al een vertaling met deze vertaalsleutel, wilt u deze samenvoegen?
+dialogs.translation.conflict.title = Conflict
+dialogs.translation.duplicate.error = De opgegeven waarde is niet geldig.
 dialogs.translation.duplicate.text = Nieuwe naam:
 dialogs.translation.duplicate.title = Vertaling Dupliceren
 dialogs.translation.find.error = Geen vertaling gevonden.
-dialogs.translation.find.text = Key van de vertaling:
+dialogs.translation.find.text = Vertaalsleutel:
 dialogs.translation.find.title = Vertaling Zoeken
-dialogs.translation.rename.error = De opgegeven key is niet geldig.
-dialogs.translation.rename.text = Nieuwe key:
+dialogs.translation.rename.error = De opgegeven waarde is niet geldig.
+dialogs.translation.rename.text = Nieuwe vertaalsleutel:
 dialogs.translation.rename.title = Vertaling Hernoemen
 dialogs.version.link = Klik hier om te downloaden
 dialogs.version.new = Een nieuwe versie is beschikbaar:
 dialogs.version.title = Beschikbare Updates
 dialogs.version.uptodate = Je gebruikt de nieuwste versie.
 
-menu.edit.add.locale.title = Locale Toevoegen...
+menu.edit.add.locale.title = Taal Toevoegen...
 menu.edit.add.translation.title = Vertaling Toevoegen...
 menu.edit.delete.title = Vertaling Verwijderen
 menu.edit.duplicate.title = Vertaling Dupliceren...
 menu.edit.find.translation.title = Vertaling Zoeken...
 menu.edit.rename.title = Vertaling Hernoemen...
-menu.edit.copy.key.title = Copy Translation Key...
+menu.edit.copy.key.title = Vertaalsleutel Kopi\u00EBren
 menu.edit.title = Bewerken
 menu.edit.vk = W
 menu.file.exit.title = Sluiten
@@ -71,8 +71,8 @@ menu.settings.preferences.editor.title = Voorkeuren...
 menu.settings.preferences.project.title = Projectvoorkeuren...
 menu.settings.title = Instellingen
 menu.settings.vk = I
-menu.view.collapse.title = Alle Vertalingen Invouwen
-menu.view.expand.title = Alle Vertalingen Uitvouwen
+menu.view.collapse.title = Alle Vertaalsleutels Invouwen
+menu.view.expand.title = Alle Vertaalsleutels Uitvouwen
 menu.view.title = Beeld
 menu.view.vk = L
 
@@ -87,14 +87,14 @@ settings.fieldset.editing = Weergave
 settings.fieldset.general = Algemeen
 settings.fieldset.newprojects = Nieuwe Projecten
 settings.inputheight.title = Standaardhoogte van invoervelden
-settings.keyfield.title = Toon vertalingskey veld
-settings.minify.title = Comprimeer vertalingen bij opslaan
+settings.keyfield.title = Toon vertaalsleutelveld
+settings.minify.title = Sla vertalingsbestanden gecomprimeerd op
 settings.resourcedef.help = <html>U kunt met '{' '}' tags het locale gedeelte aangeven binnen de bestandsnaam.<br>De tekst LOCALE binnen deze tags zal vervangen worden door de werkelijke locale.<br>Voorbeeld: translations'{'_LOCALE'}' wordt translations_nl_NL.</html>
 settings.resourcedef.title = Bestandsnaam vertalingen
-settings.resourcedirs.title = Vertalingsbestanden opslaan in afzonderlijke mappen
-settings.treetogglemode.title = Vertalingen in- en uitvouwen met dubbelklik
+settings.resourcedirs.title = Sla vertalingsbestanden in afzonderlijke mappen op
+settings.treetogglemode.title = Vertaalsleutels in- en uitvouwen met dubbelklik
 settings.checkversion.title = Controleer op nieuwe versie bij opstarten
-settings.plainJSON.title= Plain JSON keys
+settings.flattenjson.title = Sla JSON vertalingsbestanden in platte structuur op
 
 swing.action.copy = Kopi\u00ebren
 swing.action.cut = Knippen

src/main/resources/bundles/messages_pt_BR.properties

@@ -41,7 +41,7 @@ menu.edit.delete.title = Excluir Tradu\u00e7\u00e3o
 menu.edit.duplicate.title = Duplicar Tradu\u00e7\u00e3o...
 menu.edit.find.translation.title = Localizar Tradu\u00e7\u00e3o...
 menu.edit.rename.title = Renomear Tradu\u00e7\u00e3o...
-menu.edit.copy.key.title = Copy Translation Key...
+menu.edit.copy.key.title = Copy Translation Key
 menu.edit.title = Editar
 menu.edit.vk = E
 menu.file.exit.title = Sair
@@ -94,7 +94,7 @@ settings.resourcedef.title = Nome do arquivo de tradu\u00e7\u00e3es
 settings.resourcedirs.title = Save translation files in locale folders
 settings.treetogglemode.title = Expandir e contrair tradu\u00e7\u00f5es usando duplo clique
 settings.checkversion.title = Verificar a nova vers\u00e3o na inicializa\u00e7\u00e3o
-settings.plainJSON.title= Plain JSON keys
+settings.flattenjson.title = Flatten JSON translation files on save
 
 swing.action.copy = Copiar
 swing.action.cut = Cortar