From 5db40e1a4fc9944fba2f2718e9a0c3b6b95bb042 Mon Sep 17 00:00:00 2001 From: iMoHax Date: Thu, 28 Aug 2014 21:47:06 +0400 Subject: [PATCH] - change items id - add support localization for item name - change station name for support EMDN --- client/ext-resources/all/world.xml | 3449 +++++++++-------- .../controllers/VendorEditorController.java | 4 +- .../main/java/ru/trader/model/ItemModel.java | 4 +- .../ru/trader/view/support/Localization.java | 13 +- .../src/main/resources/lang/locale.properties | 73 + .../src/main/resources/lang/ru_Ru.properties | 19 - 6 files changed, 1860 insertions(+), 1702 deletions(-) create mode 100644 client/src/main/resources/lang/locale.properties delete mode 100644 client/src/main/resources/lang/ru_Ru.properties diff --git a/client/ext-resources/all/world.xml b/client/ext-resources/all/world.xml index 4edce50..8472de2 100644 --- a/client/ext-resources/all/world.xml +++ b/client/ext-resources/all/world.xml @@ -1,82 +1,79 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -90,2025 +87,2125 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + - + - - - - + + + + + + + + + + + + + + + - - - - + - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + - - - - - - - - - - + - - - - - - - - - - - - - + - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + - - - - + + + - - - - - - + - + + + + + - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + - - - - - - - - + - - - - - - - - + + - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + - - + + + + + + + + + + + + + + + + + + + - - + + - + - + + + + + + + - - - - - - - - - - - - - - - + + - + - + - - + + + + + + + + + + + + + - - + + + - - - - - - - - - - - - - - - - - + + + - - - - + + + + + + + + + + + - - - - - + + + + + + + + - - - - - - + - - - - - - - - - - + + - - - - - - - - - + - - - - + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + - - - - - - - - - - - - - - - - - - + - - + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + - - - - - - - + + - - - - - - - - - - - - - - - - - - - - + + - - + + + - - - - - - - - + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + - + + + - - - - - - - + + - - - - - + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - + - - - - - - - + - - - - - + + + + + + + + - - - - + - - - - - - + + + - - - - + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + - - - - - + + + + + + + - - - - - - + - - - - - + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + - - - - - + + - - - - - - - + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + - - - - - + + + - - - - - + - - - - + + + - - - - + - + + + + + + + - - + + + + - + + + + + + - - - - - - - - - - - + + - - - - - + + + + + + + + + - - - - - - - - - + - - - - - - + + + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + - - - - - - - - + + + + - - - - - + - - - - + + + - - - + - + + + + + + + - - + + + - + + + + + - - - - - - - + + + - - - - - + - - - + + + - - - + - + + + + + + + - - + + + - + + + + - - - - - - + + + + + - - - - - + - - - - - + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + - - - - - + + + + + - - - - - - - - - + - - - - - - - - - - - + + + - - - - - - - - - + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - - - - - - - - - - - - + - - - - - - - - - - + - - - - - + + + + + - - - + + + + - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + - - + + - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + - - - - - + + - - - - - - + - - - - - - - + - + - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + - - - - + - - - - - - + + + - - - - + + + + + + + + + + + + + + - - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + - - - - - - - - - - + - - - - - - - - - - + + + + - - - - - - - - - + + + + + + + - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + - + + + + + - - - + - - - - - - + - - - - - - - - - - - + - - + + + - + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + - - - - - + - - - - + + + - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + - - - - - - - - - - - + - - + + + - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - + + + + + + + + - - - - - - - - - - + + - - + + + + + + + + - - - - + + + - - - - - - - - - - - - - - + + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + - - - - - - + - - - - - - - - - + + - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + - - - - + - - - - - - + + + - - - - + + + + + + + + + + + + + + - - - - - - - - - - - + + + - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + - - - - - - - + - - - - - - - - - - - - + - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - + + - - - - - - + + + + + + - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + - - + - - - - - - - - + + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + - - - - - - - - - + - - - - - + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + - - - + + + + + + + - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + - + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/client/src/main/java/ru/trader/controllers/VendorEditorController.java b/client/src/main/java/ru/trader/controllers/VendorEditorController.java index 9cb1968..42abfb9 100644 --- a/client/src/main/java/ru/trader/controllers/VendorEditorController.java +++ b/client/src/main/java/ru/trader/controllers/VendorEditorController.java @@ -232,8 +232,8 @@ public class VendorEditorController { ItemData data = emdnData.getData(offer.item.getId()); LOG.debug("Update item {} to {}", offer.item.getName(), data); if (data != null){ - offer.setBprice(data.getBuy()); - offer.setSprice(data.getSell()); + offer.setSprice(data.getBuy()); + offer.setBprice(data.getSell()); } } } diff --git a/client/src/main/java/ru/trader/model/ItemModel.java b/client/src/main/java/ru/trader/model/ItemModel.java index a2fcad2..d60fe43 100644 --- a/client/src/main/java/ru/trader/model/ItemModel.java +++ b/client/src/main/java/ru/trader/model/ItemModel.java @@ -6,6 +6,7 @@ import javafx.beans.property.StringProperty; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import ru.trader.core.Item; +import ru.trader.view.support.Localization; public class ItemModel{ private final static Logger LOG = LoggerFactory.getLogger(ItemModel.class); @@ -30,7 +31,8 @@ public class ItemModel{ public ReadOnlyStringProperty nameProperty() { if (name == null) { - name = new SimpleStringProperty(item.getName()); + String lName = Localization.getString("item."+item.getName(), item.getName()); + name = new SimpleStringProperty(lName); } return name; } diff --git a/client/src/main/java/ru/trader/view/support/Localization.java b/client/src/main/java/ru/trader/view/support/Localization.java index a4f650a..683b25d 100644 --- a/client/src/main/java/ru/trader/view/support/Localization.java +++ b/client/src/main/java/ru/trader/view/support/Localization.java @@ -6,10 +6,7 @@ import java.io.File; import java.net.MalformedURLException; import java.net.URL; import java.net.URLClassLoader; -import java.util.Arrays; -import java.util.Collection; -import java.util.Locale; -import java.util.ResourceBundle; +import java.util.*; public class Localization { private static final Locale DEFAULT = new Locale("ru", "RU"); @@ -69,6 +66,14 @@ public class Localization { return rb.getString(key); } + public static String getString(String key, String def){ + try { + return rb.getString(key); + } catch (MissingResourceException e){ + return def; + } + } + public static Locale getCurrentLocale() { return locale; } diff --git a/client/src/main/resources/lang/locale.properties b/client/src/main/resources/lang/locale.properties new file mode 100644 index 0000000..e7afd37 --- /dev/null +++ b/client/src/main/resources/lang/locale.properties @@ -0,0 +1,73 @@ +item.explosives=Explosives +item.hydrogenfuel=Hydrogen Fuels +item.mineraloil=Mineral Oil +item.pesticides=Pesticide +item.clothing=Clothing +item.consumertechnology=Consumer Technology +item.domesticappliances=Dom. Appliances +item.beer=Beer +item.liquor=Liquor +item.narcotics=Narcotics +item.tobacco=Tobacco +item.wine=Wine +item.algae=Algae +item.animalmeat=Animal Meat +item.coffee=Coffee +item.fish=Fish +item.foodcartridges=Food Cartridges +item.fruitandvegetables=Fruit and Vegetables +item.grain=Grain +item.syntheticmeat=Synthetic Meat +item.tea=Tea +item.plastics=Plastics +item.polymers=Polymers +item.semiconductors=Semiconductors +item.superconductors=Superconductors +item.cropharvesters=Crop Harvesters +item.heliostaticfurnaces=Hel-Static Furnaces +item.marinesupplies=Marine Supples +item.mineralextractors=Mineral Extractors +item.agriculturalmedicines=Agri Medicines +item.basicmedicines=Basic Medicines +item.combatstabilisers=Combat Stabilisers +item.performanceenhancers=Perfomance Enhancers +item.progenitorcells=Progenitor Cells +item.aluminium=Aluminium +item.copper=Copper +item.cobalt=Cobalt +item.gold=Gold +item.indium=Indium +item.lithium=Lithium +item.palladium=Palladium +item.tantalum=Tantalum +item.titanium=Titanium +item.silver=Silver +item.uranium=Uranium +item.bauxite=Bauxite +item.bertrandite=Bertrandite +item.beryllium=Beryllium +item.coltan=Coltan +item.gallium=Gallium +item.gallite=Gallite +item.indite=Indite +item.lepidolite=Lepidolite +item.rutile=Rutile +item.uraninite=Uraninite +item.advancedcatalysers=Advanced Catalysers +item.animalmonitors=Animal Monitors +item.aquaponicsystems=Aquaponic Systems +item.autofabricators=Auto-Fabricatos +item.bioreducinglichen=Bioreducing Lichen +item.computercomponents=Computer Components +item.hazardousenvironmentsuits=H.E. SUITS +item.resonatingseparators=Resonatic Seporator +item.robotics=Robotics +item.terrainenrichmentsystems=Terrain Enrichment Sys +item.leather=Leather +item.naturalfabrics=Natural Fabrics +item.syntheticfabrics=Synthetic Fabrics +item.biowaste=Biowaste +item.scrap=Scrap +item.nonlethalweapons=Non-lethal Wpns +item.personalweapons=Personal Weapons +item.reactivearmour=Reactive Armour \ No newline at end of file diff --git a/client/src/main/resources/lang/ru_Ru.properties b/client/src/main/resources/lang/ru_Ru.properties deleted file mode 100644 index 384f2db..0000000 --- a/client/src/main/resources/lang/ru_Ru.properties +++ /dev/null @@ -1,19 +0,0 @@ -# main.fxml -main.menu.file=\uFFFD\uFFFD\uFFFD\uFFFD -main.menu.file.save=\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD -main.menu.file.import=\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD... -main.menu.file.language=\uFFFD\uFFFD\uFFFD\uFFFD -main.menu.file.language.item=\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD -main.menu.edit=\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD -main.menu.edit.addStation=\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD \uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD -main.menu.edit.addItem=\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD \uFFFD\uFFFD\uFFFD\uFFFD\uFFFD -main.menu.edit.editStation=\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD \uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD -main.tab.items=\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD -main.tab.stations=\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD -main.tab.routes=\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD - -# add item dialog -dialogs.addItem.title=\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD \uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD \uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD -dialogs.addItem.message=\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD \uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD \uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD - -