mirror of
https://github.com/rojo-rbx/rojo.git
synced 2026-10-25 04:54:07 +00:00
Add localization test project, fix empty rows in general
This commit is contained in:
parent
147545e2f8
commit
1b749176fc
6 changed files with 114 additions and 9 deletions
|
|
@ -520,12 +520,32 @@ struct LocalizationEntryCsv {
|
||||||
|
|
||||||
impl LocalizationEntryCsv {
|
impl LocalizationEntryCsv {
|
||||||
fn to_json(self) -> LocalizationEntryJson {
|
fn to_json(self) -> LocalizationEntryJson {
|
||||||
|
fn none_if_empty(value: String) -> Option<String> {
|
||||||
|
if value.is_empty() {
|
||||||
|
None
|
||||||
|
} else {
|
||||||
|
Some(value)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
let key = none_if_empty(self.key);
|
||||||
|
let context = none_if_empty(self.context);
|
||||||
|
let example = none_if_empty(self.example);
|
||||||
|
let source = none_if_empty(self.source);
|
||||||
|
|
||||||
|
let mut values = HashMap::with_capacity(self.values.len());
|
||||||
|
for (key, value) in self.values.into_iter() {
|
||||||
|
if !key.is_empty() {
|
||||||
|
values.insert(key, value);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
LocalizationEntryJson {
|
LocalizationEntryJson {
|
||||||
key: self.key,
|
key,
|
||||||
context: self.context,
|
context,
|
||||||
example: self.example,
|
example,
|
||||||
source: self.source,
|
source,
|
||||||
values: self.values,
|
values,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -533,10 +553,18 @@ impl LocalizationEntryCsv {
|
||||||
#[derive(Debug, Serialize, Deserialize)]
|
#[derive(Debug, Serialize, Deserialize)]
|
||||||
#[serde(rename_all = "camelCase")]
|
#[serde(rename_all = "camelCase")]
|
||||||
struct LocalizationEntryJson {
|
struct LocalizationEntryJson {
|
||||||
key: String,
|
#[serde(skip_serializing_if = "Option::is_none")]
|
||||||
context: String,
|
key: Option<String>,
|
||||||
example: String,
|
|
||||||
source: String,
|
#[serde(skip_serializing_if = "Option::is_none")]
|
||||||
|
context: Option<String>,
|
||||||
|
|
||||||
|
#[serde(skip_serializing_if = "Option::is_none")]
|
||||||
|
example: Option<String>,
|
||||||
|
|
||||||
|
#[serde(skip_serializing_if = "Option::is_none")]
|
||||||
|
source: Option<String>,
|
||||||
|
|
||||||
values: HashMap<String, String>,
|
values: HashMap<String, String>,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -33,6 +33,7 @@ macro_rules! generate_snapshot_tests {
|
||||||
|
|
||||||
generate_snapshot_tests!(
|
generate_snapshot_tests!(
|
||||||
empty,
|
empty,
|
||||||
|
localization,
|
||||||
multi_partition_game,
|
multi_partition_game,
|
||||||
nested_partitions,
|
nested_partitions,
|
||||||
single_partition_game,
|
single_partition_game,
|
||||||
|
|
|
||||||
6
test-projects/localization/default.project.json
Normal file
6
test-projects/localization/default.project.json
Normal file
|
|
@ -0,0 +1,6 @@
|
||||||
|
{
|
||||||
|
"name": "localization",
|
||||||
|
"tree": {
|
||||||
|
"$path": "src"
|
||||||
|
}
|
||||||
|
}
|
||||||
53
test-projects/localization/expected-snapshot.json
Normal file
53
test-projects/localization/expected-snapshot.json
Normal file
|
|
@ -0,0 +1,53 @@
|
||||||
|
{
|
||||||
|
"name": "localization",
|
||||||
|
"class_name": "Folder",
|
||||||
|
"properties": {},
|
||||||
|
"children": [
|
||||||
|
{
|
||||||
|
"name": "empty-column-bug-147",
|
||||||
|
"class_name": "LocalizationTable",
|
||||||
|
"properties": {
|
||||||
|
"Contents": {
|
||||||
|
"Type": "String",
|
||||||
|
"Value": "[{\"key\":\"Language.Name\",\"source\":\"English\",\"values\":{}},{\"key\":\"Language.Region\",\"source\":\"United States\",\"values\":{}},{\"key\":\"Label.Thickness\",\"source\":\"Thickness\",\"values\":{}},{\"key\":\"Label.Opacity\",\"source\":\"Opacity\",\"values\":{}},{\"key\":\"Toolbar.Undo\",\"source\":\"Undo\",\"values\":{}},{\"key\":\"Toolbar.Redo\",\"source\":\"Redo\",\"values\":{}},{\"key\":\"Toolbar.Camera\",\"source\":\"Top-down camera\",\"values\":{}},{\"key\":\"Toolbar.Saves\",\"source\":\"Saved drawings\",\"values\":{}},{\"key\":\"Toolbar.Preferences\",\"source\":\"Settings\",\"values\":{}},{\"key\":\"Toolbar.Mode.Vector\",\"source\":\"Vector mode\",\"values\":{}},{\"key\":\"Toolbar.Mode.Pixel\",\"source\":\"Pixel mode\",\"values\":{}}]"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"children": [],
|
||||||
|
"metadata": {
|
||||||
|
"ignore_unknown_instances": false,
|
||||||
|
"source_path": "src/empty-column-bug-147.csv",
|
||||||
|
"project_definition": null
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "normal",
|
||||||
|
"class_name": "LocalizationTable",
|
||||||
|
"properties": {
|
||||||
|
"Contents": {
|
||||||
|
"Type": "String",
|
||||||
|
"Value": "[]"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"children": [],
|
||||||
|
"metadata": {
|
||||||
|
"ignore_unknown_instances": false,
|
||||||
|
"source_path": "src/normal.csv",
|
||||||
|
"project_definition": null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"metadata": {
|
||||||
|
"ignore_unknown_instances": false,
|
||||||
|
"source_path": "src",
|
||||||
|
"project_definition": [
|
||||||
|
"localization",
|
||||||
|
{
|
||||||
|
"class_name": null,
|
||||||
|
"children": {},
|
||||||
|
"properties": {},
|
||||||
|
"ignore_unknown_instances": null,
|
||||||
|
"path": "src"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
17
test-projects/localization/src/empty-column-bug-147.csv
Normal file
17
test-projects/localization/src/empty-column-bug-147.csv
Normal file
|
|
@ -0,0 +1,17 @@
|
||||||
|
,Key,Source,Context,Example
|
||||||
|
,,,,
|
||||||
|
Metadata,Language.Name,English,,
|
||||||
|
,Language.Region,United States,,
|
||||||
|
,,,,
|
||||||
|
Options,Label.Thickness,Thickness,,
|
||||||
|
,Label.Opacity,Opacity,,
|
||||||
|
,,,,
|
||||||
|
Toolbar,Toolbar.Undo,Undo,,
|
||||||
|
,Toolbar.Redo,Redo,,
|
||||||
|
,,,,
|
||||||
|
,Toolbar.Camera,Top-down camera,,
|
||||||
|
,Toolbar.Saves,Saved drawings,,
|
||||||
|
,Toolbar.Preferences,Settings,,
|
||||||
|
,,,,
|
||||||
|
,Toolbar.Mode.Vector,Vector mode,,
|
||||||
|
,Toolbar.Mode.Pixel,Pixel mode,,
|
||||||
|
0
test-projects/localization/src/normal.csv
Normal file
0
test-projects/localization/src/normal.csv
Normal file
|
|
Loading…
Add table
Add a link
Reference in a new issue