Voomra/trader
Archived
0
Fork 0
Code Activity

add localisation strings

Browse Source
This commit is contained in:
Mo
2016-11-10 14:52:18 +03:00
parent 72570059a4
commit c867bb50f0
5 changed files with 87 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client/src/main/java/ru/trader/controllers/MainController.java
View File

@@ -56,6 +56,8 @@ public class MainController {
@FXML
private RouteTrackController routeController;
@FXML
private PowerPlayController ppController;
@FXML
private TabPane tabs;
@FXML
private Tab track;
@@ -121,7 +123,9 @@ public class MainController {
routesController.init();
searchController.init();
routeController.init();
//TODO: add init all controllers
if (ppController != null) {
ppController.init();
}
}
public void initEDCE(){

4
client/src/main/java/ru/trader/controllers/PowerPlayController.java
View File

@@ -98,8 +98,8 @@ public class PowerPlayController {
}
void init(){
//TODO: add to screens reinit
result.clear();
detail.clear();
world = MainController.getWorld();
analyzator = world.getPowerPlayAnalyzer();
if (cbCurrentPower.getValue() != POWER.NONE && cbCurrentPower.getValue() != null){

26
client/src/main/resources/lang/locale_en_US.properties
View File

@@ -10,6 +10,7 @@ market.government=Government
market.economic=Economy
market.power=Power
market.powerState=State
market.population=Population
#Item
market.item=Commodity
@@ -23,6 +24,9 @@ market.group=Group
#System
market.system=System
market.system.name=Name
market.system.income=Income
market.system.upkeep=Upkeep
market.system.controlling=Controlled
#Station
market.station=Station
@@ -30,6 +34,7 @@ market.station.name=Name
market.station.distance=Distance
market.station.services=Facilities
market.station.type=Station type
market.station.landpad=Landpad
# Offer
market.offer.buy=Buy
@@ -101,6 +106,7 @@ main.menu.settings.filter=Filter
main.tab.routes=Routes
main.tab.search=Search
main.tab.route=Current route
main.tab.powerplay=Powerplay
# add item dialog
dialog.item.title=Adding new commodity
@@ -263,6 +269,26 @@ missions.delivery.text=Deliver %d items to %s at %s
missions.courier.text=Deliver message to %s at %s
missions.supply.text=Supply %d %s to %s at %s
#powerplay.fxml
powerplay.analyze.title=Analyze parameters
powerplay.analyze.intersect=Intersect search
powerplay.analyze.near=Near search without intersect
powerplay.analyze.maxIntersect=Max intersection search
powerplay.analyze.expansions=Near expansions
powerplay.analyze.controlling=Systems in controlled radius
powerplay.analyze.search=Start analyze
powerplay.label.checked=Checked system:
powerplay.label.headquarter=Headquarter:
powerplay.label.controlling=Controlled systems:
powerplay.label.power.systems=Systems of Power:
powerplay.label.power.state=State:
powerplay.label.populationSumm=Summ populations:
powerplay.result.title=Analyze result
powerplay.column.intersecting=Intersect
powerplay.column.intersectCount=Intersect count
powerplay.column.distanceHQ=Distance to HQ
powerplay.detail.title=Systems in 15 LY
#helper
helper.system=System:
helper.station=Station:

26
client/src/main/resources/lang/locale_ru_RU.properties
View File

@@ -10,6 +10,7 @@ market.government=\u0424\u043E\u0440\u043C\u0430 \u043F\u0440\u0430\u0432\u043B\
market.economic=\u042D\u043A\u043E\u043D\u043E\u043C\u0438\u043A\u0430
market.power=\u0421\u0438\u043B\u0430
market.powerState=\u0421\u0442\u0430\u0442\u0443\u0441
market.population=\u041D\u0430\u0441\u0435\u043B\u0435\u043D\u0438\u0435
#Item
market.item=\u0422\u043E\u0432\u0430\u0440
@@ -23,6 +24,9 @@ market.group=\u0413\u0440\u0443\u043F\u043F\u0430
#System
market.system=\u0421\u0438\u0441\u0442\u0435\u043C\u0430
market.system.name=\u041D\u0430\u0437\u0432\u0430\u043D\u0438\u0435
market.system.income=Income
market.system.upkeep=Upkeep
market.system.controlling=\u041A\u043E\u043D\u0442\u0440\u043E\u043B\u0438\u0440\u0443\u0435\u0442\u0441\u044F
#Station
market.station=\u0421\u0442\u0430\u043D\u0446\u0438\u044F
@@ -30,6 +34,7 @@ market.station.name=\u041D\u0430\u0437\u0432\u0430\u043D\u0438\u0435
market.station.distance=\u0414\u0438\u0441\u0442\u0430\u043D\u0446\u0438\u044F
market.station.services=\u0421\u043E\u043E\u0440\u0443\u0436\u0435\u043D\u0438\u044F
market.station.type=\u0422\u0438\u043F \u0441\u0442\u0430\u043D\u0446\u0438\u0438
market.station.landpad=\u0422\u0438\u043F \u043F\u043B\u043E\u0449\u0430\u0434\u043A\u0438
# Offer
@@ -102,6 +107,7 @@ main.menu.settings.filter=\u0424\u0438\u043B\u044C\u0442\u0440
main.tab.routes=\u041C\u0430\u0440\u0448\u0440\u0443\u0442\u044B
main.tab.search=\u041F\u043E\u0438\u0441\u043A
main.tab.route=\u0422\u0435\u043A\u0443\u0449\u0438\u0439 \u043C\u0430\u0440\u0448\u0440\u0443\u0442
main.tab.powerplay=\u041F\u043E\u0432\u0435\u0440\u043F\u043B\u0435\u0439
# add item dialog
dialog.item.title=\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0438\u0435 \u043D\u043E\u0432\u043E\u0433\u043E \u0442\u043E\u0432\u0430\u0440\u0430
@@ -263,6 +269,26 @@ missions.delivery.text=\u0414\u043E\u0441\u0442\u0430\u0432\u0438\u0442\u044C %d
missions.courier.text=\u0414\u043E\u0441\u0442\u0430\u0432\u0438\u0442\u044C \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u0435 \u043D\u0430 %s \u0434\u043E %s
missions.supply.text=\u041A\u0443\u043F\u0438\u0442\u044C \u0438 \u0434\u043E\u0441\u0442\u0430\u0432\u0438\u0442\u044C %d %s \u043D\u0430 %s \u0434\u043E %s
#powerplay.fxml
powerplay.analyze.title=\u041F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u044B \u0430\u043D\u0430\u043B\u0438\u0437\u0430
powerplay.analyze.intersect=\u041F\u043E\u0438\u0441\u043A \u043F\u0435\u0440\u0435\u0441\u0435\u0447\u0435\u043D\u0438\u0439
powerplay.analyze.near=\u041F\u043E\u0438\u0441\u043A \u0431\u043B\u0438\u0436\u0430\u0439\u0448\u0438\u0445 \u0431\u0435\u0437 \u043F\u0435\u0440\u0435\u0441\u0435\u0447\u0435\u043D\u0438\u0439
powerplay.analyze.maxIntersect=\u041F\u043E\u0438\u0441\u043A \u0441 \u043C\u0430\u043A\u0441\u0438\u043C\u0430\u043B\u044C\u043D\u044B\u043C \u043F\u0435\u0440\u0435\u0441\u0435\u0447\u0435\u043D\u0438\u0435\u043C
powerplay.analyze.expansions=\u0411\u043B\u0438\u0436\u0430\u0439\u0448\u0438\u0435 \u044D\u043A\u0441\u043F\u0430\u043D\u0441\u0438\u0438
powerplay.analyze.controlling=\u0421\u0438\u0441\u0442\u0435\u043C\u044B \u0432 \u043F\u043E\u0434\u043A\u043E\u043D\u0442\u0440\u043E\u043B\u044C\u043D\u043E\u043C \u0440\u0430\u0434\u0438\u0443\u0441\u0435
powerplay.analyze.search=\u041D\u0430\u0447\u0430\u0442\u044C \u0430\u043D\u0430\u043B\u0438\u0437
powerplay.label.checked=\u041F\u0440\u043E\u0432\u0435\u0440\u044F\u0435\u043C\u0430\u044F \u0441\u0438\u0441\u0442\u0435\u043C\u0430:
powerplay.label.headquarter=\u0428\u0442\u0430\u0431 \u0441\u0438\u043B\u044B:
powerplay.label.controlling=\u041A\u043E\u043D\u0442\u0440\u043E\u043B\u043B\u0438\u0440\u0443\u0435\u043C\u044B\u0435 \u0441\u0438\u0441\u0442\u0435\u043C\u044B:
powerplay.label.power.systems=C\u0438\u0441\u0442\u0435\u043C\u044B \u0441\u0438\u043B\u044B:
powerplay.label.power.state=\u0421\u043E\u0441\u0442\u043E\u044F\u043D\u0438\u0435:
powerplay.label.populationSumm=\u0421\u0443\u043C\u043C\u0430 \u043D\u0430\u0441\u0435\u043B\u0435\u043D\u0438\u044F:
powerplay.result.title=\u0420\u0435\u0437\u0443\u043B\u044C\u0442\u0430\u0442\u044B \u0430\u043D\u0430\u043B\u0438\u0437\u0430
powerplay.column.intersecting=\u041F\u0435\u0440\u0435\u0441\u0435\u043A\u0430\u0435\u0442\u0441\u044F \u0441
powerplay.column.intersectCount=\u041F\u0435\u0440\u0435\u0441\u0435\u0447\u0435\u043D\u0438\u0439
powerplay.column.distanceHQ=\u0414\u0438\u0441\u0442\u0430\u043D\u0446\u0438\u044F \u0434\u043E HQ
powerplay.detail.title=\u0421\u0438\u0441\u0442\u0435\u043C\u044B \u0432 \u0440\u0430\u0434\u0438\u0443\u0441\u0435 15 LY
#helper
helper.system=\u0421\u0438\u0441\u0442\u0435\u043C\u0430:
helper.station=\u0421\u0442\u0430\u043D\u0446\u0438\u044F:

56
client/src/main/resources/view/powerplay.fxml
View File

@@ -14,10 +14,10 @@
prefHeight="500" >
<fx:define><Insets fx:id="tablePadding" left="0" right="0" top="0" bottom="0" /></fx:define>
<fx:define><Insets fx:id="summPadding" left="4" right="4" top="4" bottom="4" /></fx:define>
<TitledPane text="Параметры анализа" collapsible="false">
<TitledPane text="%powerplay.analyze.title" collapsible="false">
<HBox spacing="50" alignment="CENTER" minHeight="210" maxHeight="210">
<VBox minWidth="250" maxWidth="250" spacing="4">
<Label text="Проверяемая система:" />
<Label text="%powerplay.label.checked" />
<HBox spacing="4" alignment="BASELINE_LEFT">
<TextField fx:id="checkedSystemText" prefWidth="220"/>
<Button minWidth="30" onAction="#currentAsChecked"><graphic><Glyph text="FontAwesome|MAP_MARKER"/></graphic></Button>
@@ -41,31 +41,31 @@
</VBox>
<VBox minWidth="250" maxWidth="250" spacing="10" alignment="CENTER_LEFT">
<HBox spacing="4">
<Label text="Сила:" minWidth="86" maxWidth="86" />
<Label text="%powerplay.label.headquarter" minWidth="86" maxWidth="86" />
<ComboBox fx:id="cbCurrentPower" minWidth="160"/>
</HBox>
<fx:define><ToggleGroup fx:id="analyzeType" /></fx:define>
<RadioButton fx:id="rbIntersect" text="Поиск пересечений" selected="true" toggleGroup="$analyzeType"/>
<RadioButton fx:id="rbNear" text="Поиск ближайших без пересечений" selected="false" toggleGroup="$analyzeType"/>
<RadioButton fx:id="rbMaxIntersect" text="Поиск с максимальным пересечением" selected="false" toggleGroup="$analyzeType"/>
<RadioButton fx:id="rbExpansions" text="Ближайшие экспансии" selected="false" toggleGroup="$analyzeType"/>
<RadioButton fx:id="rbControlling" text="Системы в подконтрольном радиусе" selected="false" toggleGroup="$analyzeType"/>
<RadioButton fx:id="rbIntersect" text="%powerplay.analyze.intersect" selected="true" toggleGroup="$analyzeType"/>
<RadioButton fx:id="rbNear" text="%powerplay.analyze.near" selected="false" toggleGroup="$analyzeType"/>
<RadioButton fx:id="rbMaxIntersect" text="%powerplay.analyze.maxIntersect" selected="false" toggleGroup="$analyzeType"/>
<RadioButton fx:id="rbExpansions" text="%powerplay.analyze.expansions" selected="false" toggleGroup="$analyzeType"/>
<RadioButton fx:id="rbControlling" text="%powerplay.analyze.controlling" selected="false" toggleGroup="$analyzeType"/>
<HBox alignment="CENTER">
<Button prefWidth="120" text="Начать анализ" onAction="#search" />
<Button prefWidth="120" text="%powerplay.analyze.search" onAction="#search" />
</HBox>
</VBox>
<VBox minWidth="250" maxWidth="250" spacing="4">
<Label text="Контроллируемые системы:" />
<Label text="%powerplay.label.controlling" />
<HBox spacing="4">
<TextField fx:id="controlSystemText" prefWidth="220"/>
<Button minWidth="30" onAction="#currentAsControl"><graphic><Glyph text="FontAwesome|MAP_MARKER"/></graphic></Button>
</HBox>
<HBox HBox.hgrow="ALWAYS" spacing="4">
<Label text="Cистемы силы:" minWidth="86" maxWidth="86" />
<Label text="%powerplay.label.power.systems" minWidth="86" maxWidth="86" />
<ComboBox fx:id="cbPower" minWidth="160"/>
</HBox>
<HBox HBox.hgrow="ALWAYS" spacing="4">
<Label text="Состояние:" minWidth="86" maxWidth="86" />
<Label text="%powerplay.label.power.state" minWidth="86" maxWidth="86" />
<CheckComboBox fx:id="cbStates" minWidth="160" />
</HBox>
<HBox spacing="4" alignment="CENTER" VBox.vgrow="ALWAYS" HBox.hgrow="ALWAYS">
@@ -89,17 +89,17 @@
</TitledPane>
<MasterDetailPane fx:id="resultPane" detailSide="RIGHT" prefWidth="1190" dividerPosition="0.566" showDetailNode="false" VBox.vgrow="ALWAYS">
<masterNode>
<TitledPane text="Результаты анализа" collapsible="false">
<TitledPane text="%powerplay.result.title" collapsible="false">
<VBox spacing="4" padding="$tablePadding">
<TableView fx:id="tblResults" VBox.vgrow="ALWAYS">
<columns>
<TableColumn prefWidth="150" text="%market.system">
<cellValueFactory><PropertyValueFactory property="name"/></cellValueFactory>
</TableColumn>
<TableColumn prefWidth="150" text="Пересекается с">
<TableColumn prefWidth="150" text="%powerplay.column.intersecting">
<cellValueFactory><PropertyValueFactory property="intersecting"/></cellValueFactory>
</TableColumn>
<TableColumn prefWidth="90" text="Пересечений">
<TableColumn prefWidth="90" text="%powerplay.column.intersectCount">
<cellValueFactory><PropertyValueFactory property="intersectCount"/></cellValueFactory>
</TableColumn>
<TableColumn prefWidth="100" text="%market.powerState">
@@ -122,23 +122,23 @@
<cellFactory><DistanceCell /></cellFactory>
<cellValueFactory><PropertyValueFactory property="distance"/></cellValueFactory>
</TableColumn>
<TableColumn prefWidth="80" text="Income">
<TableColumn prefWidth="60" text="%market.system.income">
<cellValueFactory><PropertyValueFactory property="income"/></cellValueFactory>
</TableColumn>
<TableColumn prefWidth="80" text="Upkeep">
<TableColumn prefWidth="60" text="%market.system.upkeep">
<cellValueFactory><PropertyValueFactory property="upkeep"/></cellValueFactory>
</TableColumn>
<TableColumn prefWidth="80" text="Население">
<TableColumn prefWidth="80" text="%market.population">
<cellFactory><TextCell><converter><CustomNumberStringConverter pattern="#,##0.##" /></converter></TextCell></cellFactory>
<cellValueFactory><PropertyValueFactory property="population"/></cellValueFactory>
</TableColumn>
<TableColumn prefWidth="100" text="Тип площадки">
<TableColumn prefWidth="100" text="%market.station.landpad">
<cellValueFactory><PropertyValueFactory property="nearStations"/></cellValueFactory>
</TableColumn>
<TableColumn prefWidth="150" text="Контролируется">
<TableColumn prefWidth="150" text="%market.system.controlling">
<cellValueFactory><PropertyValueFactory property="controlling"/></cellValueFactory>
</TableColumn>
<TableColumn prefWidth="80" text="Дистанция до HQ">
<TableColumn prefWidth="80" text="%powerplay.column.distanceHQ">
<cellFactory><DistanceCell /></cellFactory>
<cellValueFactory><PropertyValueFactory property="distanceHQ"/></cellValueFactory>
</TableColumn>
@@ -154,12 +154,12 @@
</ContextMenu>
</contextMenu>
</TableView>
<HBox spacing="4" padding="$summPadding"><Label text="Сумма населения:" /><Label fx:id="resultPopSumm" /></HBox>
<HBox spacing="4" padding="$summPadding"><Label text="%powerplay.label.populationSumm" /><Label fx:id="resultPopSumm" /></HBox>
</VBox>
</TitledPane>
</masterNode>
<detailNode>
<TitledPane text="Системы в радиусе 15 LY" collapsible="false">
<TitledPane text="%powerplay.detail.title" collapsible="false">
<VBox spacing="4" padding="$tablePadding">
<TableView fx:id="tblDetail" VBox.vgrow="ALWAYS">
<columns>
@@ -182,17 +182,17 @@
<cellFactory><TextCell><converter><FactionStringConverter /></converter></TextCell></cellFactory>
<cellValueFactory><PropertyValueFactory property="faction"/></cellValueFactory>
</TableColumn>
<TableColumn prefWidth="80" text="Income">
<TableColumn prefWidth="60" text="%market.system.income">
<cellValueFactory><PropertyValueFactory property="income"/></cellValueFactory>
</TableColumn>
<TableColumn prefWidth="80" text="Upkeep">
<TableColumn prefWidth="60" text="%market.system.upkeep">
<cellValueFactory><PropertyValueFactory property="upkeep"/></cellValueFactory>
</TableColumn>
<TableColumn prefWidth="80" text="Население">
<TableColumn prefWidth="80" text="%market.population">
<cellFactory><TextCell><converter><CustomNumberStringConverter pattern="#,##0.##" /></converter></TextCell></cellFactory>
<cellValueFactory><PropertyValueFactory property="population"/></cellValueFactory>
</TableColumn>
<TableColumn prefWidth="150" text="Контролируется">
<TableColumn prefWidth="150" text="%market.system.controlling">
<cellValueFactory><PropertyValueFactory property="controlling"/></cellValueFactory>
</TableColumn>
</columns>
@@ -207,7 +207,7 @@
</ContextMenu>
</contextMenu>
</TableView>
<HBox spacing="4" padding="$summPadding"><Label text="Сумма населения:" /><Label fx:id="detailPopSumm" /></HBox>
<HBox spacing="4" padding="$summPadding"><Label text="%powerplay.label.populationSumm" /><Label fx:id="detailPopSumm" /></HBox>
</VBox>
</TitledPane>
</detailNode>