Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add "Фича" and "Шаблон примера" as more convenient translations #2078

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions gherkin/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ This document is formatted according to the principles of [Keep A CHANGELOG](htt
### Added
* Additional `ja` (Japanese) translations for `and`, `but`
* Added `amh` (Amharic) translation
* Add `Фича` and `Шаблон примера` as more convenient translations ([#2078](https://github.com/cucumber/common/pull/2078))

### Changed
* `ja` (Japanese) `Rule` translation changed from `Rule` to `ルール`
Expand Down
3 changes: 2 additions & 1 deletion gherkin/c/gherkin-languages.json
Original file line number Diff line number Diff line change
Expand Up @@ -2782,7 +2782,8 @@
"Функция",
"Функциональность",
"Функционал",
"Свойство"
"Свойство",
"Фича"
],
"given": [
"* ",
Expand Down
85 changes: 67 additions & 18 deletions gherkin/c/src/dialect.c
Original file line number Diff line number Diff line change
Expand Up @@ -1974,38 +1974,38 @@ static const Dialect jv_dialect = {
&jv_then_keywords,
&jv_when_keywords };

static const wchar_t* const ka_and_KEYWORDS[] = { L"* ", L"და" };
static const Keywords ka_and_keywords = { 2, ka_and_KEYWORDS };
static const wchar_t* const ka_and_KEYWORDS[] = { L"* ", L"და ", L"ასევე " };
static const Keywords ka_and_keywords = { 3, ka_and_KEYWORDS };

static const wchar_t* const ka_background_KEYWORDS[] = { L"კონტექსტი" };
static const Keywords ka_background_keywords = { 1, ka_background_KEYWORDS };

static const wchar_t* const ka_but_KEYWORDS[] = { L"* ", L"მაგ­რამ" };
static const Keywords ka_but_keywords = { 2, ka_but_KEYWORDS };
static const wchar_t* const ka_but_KEYWORDS[] = { L"* ", L"მაგრამ ", L"თუმცა " };
static const Keywords ka_but_keywords = { 3, ka_but_KEYWORDS };

static const wchar_t* const ka_examples_KEYWORDS[] = { L"მაგალითები" };
static const Keywords ka_examples_keywords = { 1, ka_examples_KEYWORDS };

static const wchar_t* const ka_feature_KEYWORDS[] = { L"თვისება" };
static const Keywords ka_feature_keywords = { 1, ka_feature_KEYWORDS };
static const wchar_t* const ka_feature_KEYWORDS[] = { L"თვისება", L"მოთხოვნა" };
static const Keywords ka_feature_keywords = { 2, ka_feature_KEYWORDS };

static const wchar_t* const ka_given_KEYWORDS[] = { L"* ", L"მოცემული" };
static const Keywords ka_given_keywords = { 2, ka_given_KEYWORDS };
static const wchar_t* const ka_given_KEYWORDS[] = { L"* ", L"მოცემული ", L"Მოცემულია ", L"ვთქვათ " };
static const Keywords ka_given_keywords = { 4, ka_given_KEYWORDS };

static const wchar_t* const ka_rule_KEYWORDS[] = { L"Rule" };
static const wchar_t* const ka_rule_KEYWORDS[] = { L"წესი" };
static const Keywords ka_rule_keywords = { 1, ka_rule_KEYWORDS };

static const wchar_t* const ka_scenario_KEYWORDS[] = { L"მაგალითად", L"სცენარის" };
static const Keywords ka_scenario_keywords = { 2, ka_scenario_KEYWORDS };
static const wchar_t* const ka_scenario_KEYWORDS[] = { L"მაგალითად", L"მაგალითი", L"მაგ", L"სცენარი" };
static const Keywords ka_scenario_keywords = { 4, ka_scenario_KEYWORDS };

static const wchar_t* const ka_scenarioOutline_KEYWORDS[] = { L"სცენარის ნიმუში" };
static const Keywords ka_scenarioOutline_keywords = { 1, ka_scenarioOutline_KEYWORDS };
static const wchar_t* const ka_scenarioOutline_KEYWORDS[] = { L"სცენარის ნიმუში", L"სცენარის შაბლონი", L"ნიმუში", L"შაბლონი" };
static const Keywords ka_scenarioOutline_keywords = { 4, ka_scenarioOutline_KEYWORDS };

static const wchar_t* const ka_then_KEYWORDS[] = { L"* ", L"მაშინ" };
static const wchar_t* const ka_then_KEYWORDS[] = { L"* ", L"მაშინ " };
static const Keywords ka_then_keywords = { 2, ka_then_KEYWORDS };

static const wchar_t* const ka_when_KEYWORDS[] = { L"* ", L"როდესაც" };
static const Keywords ka_when_keywords = { 2, ka_when_KEYWORDS };
static const wchar_t* const ka_when_KEYWORDS[] = { L"* ", L"როდესაც ", L"როცა ", L"როგორც კი ", L"თუ " };
static const Keywords ka_when_keywords = { 5, ka_when_KEYWORDS };

static const Dialect ka_dialect = {
L"ka",
Expand Down Expand Up @@ -2738,8 +2738,8 @@ static const Keywords ru_but_keywords = { 4, ru_but_KEYWORDS };
static const wchar_t* const ru_examples_KEYWORDS[] = { L"Примеры" };
static const Keywords ru_examples_keywords = { 1, ru_examples_KEYWORDS };

static const wchar_t* const ru_feature_KEYWORDS[] = { L"Функция", L"Функциональность", L"Функционал", L"Свойство" };
static const Keywords ru_feature_keywords = { 4, ru_feature_KEYWORDS };
static const wchar_t* const ru_feature_KEYWORDS[] = { L"Функция", L"Функциональность", L"Функционал", L"Свойство", L"Фича" };
static const Keywords ru_feature_keywords = { 5, ru_feature_KEYWORDS };

static const wchar_t* const ru_given_KEYWORDS[] = { L"* ", L"Допустим ", L"Дано ", L"Пусть " };
static const Keywords ru_given_keywords = { 4, ru_given_KEYWORDS };
Expand Down Expand Up @@ -3619,6 +3619,53 @@ static const Dialect mr_dialect = {
&mr_then_keywords,
&mr_when_keywords };

static const wchar_t* const amh_and_KEYWORDS[] = { L"* ", L"እና " };
static const Keywords amh_and_keywords = { 2, amh_and_KEYWORDS };

static const wchar_t* const amh_background_KEYWORDS[] = { L"ቅድመ ሁኔታ", L"መነሻ", L"መነሻ ሀሳብ" };
static const Keywords amh_background_keywords = { 3, amh_background_KEYWORDS };

static const wchar_t* const amh_but_KEYWORDS[] = { L"* ", L"ግን " };
static const Keywords amh_but_keywords = { 2, amh_but_KEYWORDS };

static const wchar_t* const amh_examples_KEYWORDS[] = { L"ምሳሌዎች", L"ሁናቴዎች" };
static const Keywords amh_examples_keywords = { 2, amh_examples_KEYWORDS };

static const wchar_t* const amh_feature_KEYWORDS[] = { L"ስራ", L"የተፈለገው ስራ", L"የሚፈለገው ድርጊት" };
static const Keywords amh_feature_keywords = { 3, amh_feature_KEYWORDS };

static const wchar_t* const amh_given_KEYWORDS[] = { L"* ", L"የተሰጠ " };
static const Keywords amh_given_keywords = { 2, amh_given_KEYWORDS };

static const wchar_t* const amh_rule_KEYWORDS[] = { L"ህግ" };
static const Keywords amh_rule_keywords = { 1, amh_rule_KEYWORDS };

static const wchar_t* const amh_scenario_KEYWORDS[] = { L"ምሳሌ", L"ሁናቴ" };
static const Keywords amh_scenario_keywords = { 2, amh_scenario_KEYWORDS };

static const wchar_t* const amh_scenarioOutline_KEYWORDS[] = { L"ሁናቴ ዝርዝር", L"ሁናቴ አብነት" };
static const Keywords amh_scenarioOutline_keywords = { 2, amh_scenarioOutline_KEYWORDS };

static const wchar_t* const amh_then_KEYWORDS[] = { L"* ", L"ከዚያ " };
static const Keywords amh_then_keywords = { 2, amh_then_KEYWORDS };

static const wchar_t* const amh_when_KEYWORDS[] = { L"* ", L"መቼ " };
static const Keywords amh_when_keywords = { 2, amh_when_KEYWORDS };

static const Dialect amh_dialect = {
L"amh",
&amh_and_keywords,
&amh_background_keywords,
&amh_but_keywords,
&amh_examples_keywords,
&amh_feature_keywords,
&amh_given_keywords,
&amh_rule_keywords,
&amh_scenario_keywords,
&amh_scenarioOutline_keywords,
&amh_then_keywords,
&amh_when_keywords };

const Dialect* Dialect_for(const wchar_t* language) {
if (wcscmp(af_dialect.language_name, language) == 0)
return &af_dialect;
Expand Down Expand Up @@ -3774,6 +3821,8 @@ const Dialect* Dialect_for(const wchar_t* language) {
return &zh_TW_dialect;
if (wcscmp(mr_dialect.language_name, language) == 0)
return &mr_dialect;
if (wcscmp(amh_dialect.language_name, language) == 0)
return &amh_dialect;
return 0;
}

5 changes: 3 additions & 2 deletions gherkin/dart/assets/gherkin-languages.json
Original file line number Diff line number Diff line change
Expand Up @@ -2716,7 +2716,8 @@
"Функция",
"Функциональность",
"Функционал",
"Свойство"
"Свойство",
"Фича"
],
"given": [
"* ",
Expand Down Expand Up @@ -3621,4 +3622,4 @@
"जेव्हा "
]
}
}
}
3 changes: 2 additions & 1 deletion gherkin/dotnet/Gherkin/gherkin-languages.json
Original file line number Diff line number Diff line change
Expand Up @@ -2782,7 +2782,8 @@
"Функция",
"Функциональность",
"Функционал",
"Свойство"
"Свойство",
"Фича"
],
"given": [
"* ",
Expand Down
3 changes: 2 additions & 1 deletion gherkin/elixir/priv/gherkin_languages.json
Original file line number Diff line number Diff line change
Expand Up @@ -2782,7 +2782,8 @@
"Функция",
"Функциональность",
"Функционал",
"Свойство"
"Свойство",
"Фича"
],
"given": [
"* ",
Expand Down
3 changes: 2 additions & 1 deletion gherkin/gherkin-languages.json
Original file line number Diff line number Diff line change
Expand Up @@ -2782,7 +2782,8 @@
"Функция",
"Функциональность",
"Функционал",
"Свойство"
"Свойство",
"Фича"
],
"given": [
"* ",
Expand Down
64 changes: 63 additions & 1 deletion gherkin/go/dialects_builtin.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package gherkin

import messages "github.com/cucumber/common/messages/go/v19"

// Builtin dialects for af (Afrikaans), am (Armenian), an (Aragonese), ar (Arabic), ast (Asturian), az (Azerbaijani), bg (Bulgarian), bm (Malay), bs (Bosnian), ca (Catalan), cs (Czech), cy-GB (Welsh), da (Danish), de (German), el (Greek), em (Emoji), en (English), en-Scouse (Scouse), en-au (Australian), en-lol (LOLCAT), en-old (Old English), en-pirate (Pirate), en-tx (Texas), eo (Esperanto), es (Spanish), et (Estonian), fa (Persian), fi (Finnish), fr (French), ga (Irish), gj (Gujarati), gl (Galician), he (Hebrew), hi (Hindi), hr (Croatian), ht (Creole), hu (Hungarian), id (Indonesian), is (Icelandic), it (Italian), ja (Japanese), jv (Javanese), ka (Georgian), kn (Kannada), ko (Korean), lt (Lithuanian), lu (Luxemburgish), lv (Latvian), mk-Cyrl (Macedonian), mk-Latn (Macedonian (Latin)), mn (Mongolian), ne (Nepali), nl (Dutch), no (Norwegian), pa (Panjabi), pl (Polish), pt (Portuguese), ro (Romanian), ru (Russian), sk (Slovak), sl (Slovenian), sr-Cyrl (Serbian), sr-Latn (Serbian (Latin)), sv (Swedish), ta (Tamil), th (Thai), te (Telugu), tlh (Klingon), tr (Turkish), tt (Tatar), uk (Ukrainian), ur (Urdu), uz (Uzbek), vi (Vietnamese), zh-CN (Chinese simplified), zh-TW (Chinese traditional), mr (Marathi)
// Builtin dialects for af (Afrikaans), am (Armenian), an (Aragonese), ar (Arabic), ast (Asturian), az (Azerbaijani), bg (Bulgarian), bm (Malay), bs (Bosnian), ca (Catalan), cs (Czech), cy-GB (Welsh), da (Danish), de (German), el (Greek), em (Emoji), en (English), en-Scouse (Scouse), en-au (Australian), en-lol (LOLCAT), en-old (Old English), en-pirate (Pirate), en-tx (Texas), eo (Esperanto), es (Spanish), et (Estonian), fa (Persian), fi (Finnish), fr (French), ga (Irish), gj (Gujarati), gl (Galician), he (Hebrew), hi (Hindi), hr (Croatian), ht (Creole), hu (Hungarian), id (Indonesian), is (Icelandic), it (Italian), ja (Japanese), jv (Javanese), ka (Georgian), kn (Kannada), ko (Korean), lt (Lithuanian), lu (Luxemburgish), lv (Latvian), mk-Cyrl (Macedonian), mk-Latn (Macedonian (Latin)), mn (Mongolian), ne (Nepali), nl (Dutch), no (Norwegian), pa (Panjabi), pl (Polish), pt (Portuguese), ro (Romanian), ru (Russian), sk (Slovak), sl (Slovenian), sr-Cyrl (Serbian), sr-Latn (Serbian (Latin)), sv (Swedish), ta (Tamil), th (Thai), te (Telugu), tlh (Klingon), tr (Turkish), tt (Tatar), uk (Ukrainian), ur (Urdu), uz (Uzbek), vi (Vietnamese), zh-CN (Chinese simplified), zh-TW (Chinese traditional), mr (Marathi), amh (Amharic)
func DialectsBuiltin() DialectProvider {
return builtinDialects
}
Expand Down Expand Up @@ -3650,6 +3650,7 @@ var builtinDialects = gherkinDialectMap{
"Функциональность",
"Функционал",
"Свойство",
"Фича",
},
rule: {
"Правило",
Expand Down Expand Up @@ -4863,6 +4864,67 @@ var builtinDialects = gherkinDialectMap{
"पण ": messages.StepKeywordType_CONJUNCTION,
"परंतु ": messages.StepKeywordType_CONJUNCTION,

"* ": messages.StepKeywordType_UNKNOWN,
}},
"amh": &Dialect{
"amh", "Amharic", "አማርኛ", map[string][]string{
feature: {
"ስራ",
"የተፈለገው ስራ",
"የሚፈለገው ድርጊት",
},
rule: {
"ህግ",
},
background: {
"ቅድመ ሁኔታ",
"መነሻ",
"መነሻ ሀሳብ",
},
scenario: {
"ምሳሌ",
"ሁናቴ",
},
scenarioOutline: {
"ሁናቴ ዝርዝር",
"ሁናቴ አብነት",
},
examples: {
"ምሳሌዎች",
"ሁናቴዎች",
},
given: {
"* ",
"የተሰጠ ",
},
when: {
"* ",
"መቼ ",
},
then: {
"* ",
"ከዚያ ",
},
and: {
"* ",
"እና ",
},
but: {
"* ",
"ግን ",
},
},
map[string]messages.StepKeywordType{
"የተሰጠ ": messages.StepKeywordType_CONTEXT,

"መቼ ": messages.StepKeywordType_ACTION,

"ከዚያ ": messages.StepKeywordType_OUTCOME,

"እና ": messages.StepKeywordType_CONJUNCTION,

"ግን ": messages.StepKeywordType_CONJUNCTION,

"* ": messages.StepKeywordType_UNKNOWN,
}},
}
3 changes: 2 additions & 1 deletion gherkin/go/gherkin-languages.json
Original file line number Diff line number Diff line change
Expand Up @@ -2782,7 +2782,8 @@
"Функция",
"Функциональность",
"Функционал",
"Свойство"
"Свойство",
"Фича"
],
"given": [
"* ",
Expand Down
3 changes: 2 additions & 1 deletion gherkin/javascript/src/gherkin-languages.json
Original file line number Diff line number Diff line change
Expand Up @@ -2782,7 +2782,8 @@
"Функция",
"Функциональность",
"Функционал",
"Свойство"
"Свойство",
"Фича"
],
"given": [
"* ",
Expand Down
3 changes: 2 additions & 1 deletion gherkin/objective-c/GherkinLanguages/gherkin-languages.json
Original file line number Diff line number Diff line change
Expand Up @@ -2782,7 +2782,8 @@
"Функция",
"Функциональность",
"Функционал",
"Свойство"
"Свойство",
"Фича"
],
"given": [
"* ",
Expand Down
3 changes: 2 additions & 1 deletion gherkin/perl/gherkin-languages.json
Original file line number Diff line number Diff line change
Expand Up @@ -2782,7 +2782,8 @@
"Функция",
"Функциональность",
"Функционал",
"Свойство"
"Свойство",
"Фича"
],
"given": [
"* ",
Expand Down
2 changes: 1 addition & 1 deletion gherkin/perl/lib/Gherkin/Generated/Languages.pm

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion gherkin/php/resources/gherkin-languages.json
Original file line number Diff line number Diff line change
Expand Up @@ -2782,7 +2782,8 @@
"Функция",
"Функциональность",
"Функционал",
"Свойство"
"Свойство",
"Фича"
],
"given": [
"* ",
Expand Down
3 changes: 2 additions & 1 deletion gherkin/python/gherkin/gherkin-languages.json
Original file line number Diff line number Diff line change
Expand Up @@ -2782,7 +2782,8 @@
"Функция",
"Функциональность",
"Функционал",
"Свойство"
"Свойство",
"Фича"
],
"given": [
"* ",
Expand Down
3 changes: 2 additions & 1 deletion gherkin/ruby/lib/gherkin/gherkin-languages.json
Original file line number Diff line number Diff line change
Expand Up @@ -2782,7 +2782,8 @@
"Функция",
"Функциональность",
"Функционал",
"Свойство"
"Свойство",
"Фича"
],
"given": [
"* ",
Expand Down