Merge branch 'master' of https://github.com/behave/behave

RELATED TO: PR behave#895 and behave#827
jenisys · Jan 12, 2021 · f0af705 · f0af705
2 parents 175af23 + 2ea0d0e
commit f0af705
Show file tree

Hide file tree

Showing 5 changed files with 242 additions and 63 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -28,6 +28,8 @@ ENHANCEMENTS:
 * Use cucumber "gherkin-languages.json" now (simplify: Gherkin v6 aliases, language usage)
 * Support emojis in ``*.feature`` files and steps
 * Select-by-location: Add support for "Scenario container" (Feature, Rule, ScenarioOutline) (related to: #391)
+* pull  #895: UPDATE: i18n/gherkin-languages.json from cucumber repository #895 (related to: #827)
+* pull  #827: Fixed keyword translation in Estonian #827 (provided by: ookull)
 * issue #740: Enhancement: possibility to add cleanup to be called upon leaving outer context stack frames (submitted by: nizwiz, dcvmoole)
 * issue #678: Scenario Outline: Support tags with commas and semicolons (provided by: lawnmowerlatte, pull #679)
 * issue #675: Feature files cannot be found within symlink directories (provided by: smadness, pull #680)

diff --git a/behave/i18n.py b/behave/i18n.py
@@ -188,16 +188,19 @@
         'then': ['* ', 'Så '],
         'when': ['* ', 'Når ']},
  'de': {'and': ['* ', 'Und '],
-        'background': ['Grundlage'],
+        'background': ['Grundlage',
+                       'Hintergrund',
+                       'Voraussetzungen',
+                       'Vorbedingungen'],
         'but': ['* ', 'Aber '],
         'examples': ['Beispiele'],
-        'feature': ['Funktionalität'],
+        'feature': ['Funktionalität', 'Funktion'],
         'given': ['* ', 'Angenommen ', 'Gegeben sei ', 'Gegeben seien '],
         'name': 'German',
         'native': 'Deutsch',
-        'rule': ['Rule'],
+        'rule': ['Rule', 'Regel'],
         'scenario': ['Beispiel', 'Szenario'],
-        'scenario_outline': ['Szenariogrundriss'],
+        'scenario_outline': ['Szenariogrundriss', 'Szenarien'],
         'then': ['* ', 'Dann '],
         'when': ['* ', 'Wenn ']},
  'el': {'and': ['* ', 'Και '],
@@ -344,9 +347,9 @@
         'given': ['* ', 'Eeldades '],
         'name': 'Estonian',
         'native': 'eesti keel',
-        'rule': ['Rule'],
+        'rule': ['Reegel'],
         'scenario': ['Juhtum', 'Stsenaarium'],
-        'scenario_outline': ['Raamstjuhtum', 'Raamstsenaarium'],
+        'scenario_outline': ['Raamjuhtum', 'Raamstsenaarium'],
         'then': ['* ', 'Siis '],
         'when': ['* ', 'Kui ']},
  'fa': {'and': ['* ', 'و '],
@@ -455,7 +458,7 @@
         'given': ['* ', 'בהינתן '],
         'name': 'Hebrew',
         'native': 'עברית',
-        'rule': ['Rule'],
+        'rule': ['כלל'],
         'scenario': ['דוגמא', 'תרחיש'],
         'scenario_outline': ['תבנית תרחיש'],
         'then': ['* ', 'אז ', 'אזי '],
@@ -518,17 +521,22 @@
         'then': ['* ', 'Akkor '],
         'when': ['* ', 'Majd ', 'Ha ', 'Amikor ']},
  'id': {'and': ['* ', 'Dan '],
-        'background': ['Dasar'],
-        'but': ['* ', 'Tapi '],
-        'examples': ['Contoh'],
+        'background': ['Dasar', 'Latar Belakang'],
+        'but': ['* ', 'Tapi ', 'Tetapi '],
+        'examples': ['Contoh', 'Misal'],
         'feature': ['Fitur'],
-        'given': ['* ', 'Dengan '],
+        'given': ['* ',
+                  'Dengan ',
+                  'Diketahui ',
+                  'Diasumsikan ',
+                  'Bila ',
+                  'Jika '],
         'name': 'Indonesian',
         'native': 'Bahasa Indonesia',
-        'rule': ['Rule'],
+        'rule': ['Rule', 'Aturan'],
         'scenario': ['Skenario'],
-        'scenario_outline': ['Skenario konsep'],
-        'then': ['* ', 'Maka '],
+        'scenario_outline': ['Skenario konsep', 'Garis-Besar Skenario'],
+        'then': ['* ', 'Maka ', 'Kemudian '],
         'when': ['* ', 'Ketika ']},
  'is': {'and': ['* ', 'Og '],
         'background': ['Bakgrunnur'],
@@ -699,6 +707,32 @@
         'scenario_outline': ['Сценарын төлөвлөгөө'],
         'then': ['* ', 'Тэгэхэд ', 'Үүний дараа '],
         'when': ['* ', 'Хэрэв ']},
+ 'mr': {'and': ['* ', 'आणि ', 'तसेच '],
+        'background': ['पार्श्वभूमी'],
+        'but': ['* ', 'पण ', 'परंतु '],
+        'examples': ['उदाहरण'],
+        'feature': ['वैशिष्ट्य', 'सुविधा'],
+        'given': ['* ', 'जर', 'दिलेल्या प्रमाणे '],
+        'name': 'Marathi',
+        'native': 'मराठी',
+        'rule': ['नियम'],
+        'scenario': ['परिदृश्य'],
+        'scenario_outline': ['परिदृश्य रूपरेखा'],
+        'then': ['* ', 'मग ', 'तेव्हा '],
+        'when': ['* ', 'जेव्हा ']},
+ 'ne': {'and': ['* ', 'र ', 'अनी '],
+        'background': ['पृष्ठभूमी'],
+        'but': ['* ', 'तर '],
+        'examples': ['उदाहरण', 'उदाहरणहरु'],
+        'feature': ['सुविधा', 'विशेषता'],
+        'given': ['* ', 'दिइएको ', 'दिएको ', 'यदि '],
+        'name': 'Nepali',
+        'native': 'नेपाली',
+        'rule': ['नियम'],
+        'scenario': ['परिदृश्य'],
+        'scenario_outline': ['परिदृश्य रूपरेखा'],
+        'then': ['* ', 'त्यसपछि ', 'अनी '],
+        'when': ['* ', 'जब ']},
  'nl': {'and': ['* ', 'En '],
         'background': ['Achtergrond'],
         'but': ['* ', 'Maar '],
@@ -797,7 +831,7 @@
         'given': ['* ', 'Допустим ', 'Дано ', 'Пусть '],
         'name': 'Russian',
         'native': 'русский',
-        'rule': ['Rule'],
+        'rule': ['Правило'],
         'scenario': ['Пример', 'Сценарий'],
         'scenario_outline': ['Структура сценария'],
         'then': ['* ', 'То ', 'Затем ', 'Тогда '],
@@ -873,7 +907,7 @@
         'given': ['* ', 'Givet '],
         'name': 'Swedish',
         'native': 'Svenska',
-        'rule': ['Rule'],
+        'rule': ['Regel'],
         'scenario': ['Scenario'],
         'scenario_outline': ['Abstrakt Scenario', 'Scenariomall'],
         'then': ['* ', 'Så '],
@@ -891,6 +925,19 @@
         'scenario_outline': ['காட்சி சுருக்கம்', 'காட்சி வார்ப்புரு'],
         'then': ['* ', 'அப்பொழுது '],
         'when': ['* ', 'எப்போது ']},
+ 'te': {'and': ['* ', 'మరియు '],
+        'background': ['నేపథ్యం'],
+        'but': ['* ', 'కాని '],
+        'examples': ['ఉదాహరణలు'],
+        'feature': ['గుణము'],
+        'given': ['* ', 'చెప్పబడినది '],
+        'name': 'Telugu',
+        'native': 'తెలుగు',
+        'rule': ['Rule'],
+        'scenario': ['ఉదాహరణ', 'సన్నివేశం'],
+        'scenario_outline': ['కథనం'],
+        'then': ['* ', 'అప్పుడు '],
+        'when': ['* ', 'ఈ పరిస్థితిలో ']},
  'th': {'and': ['* ', 'และ '],
         'background': ['แนวคิด'],
         'but': ['* ', 'แต่ '],
@@ -904,19 +951,6 @@
         'scenario_outline': ['สรุปเหตุการณ์', 'โครงสร้างของเหตุการณ์'],
         'then': ['* ', 'ดังนั้น '],
         'when': ['* ', 'เมื่อ ']},
- 'tl': {'and': ['* ', 'మరియు '],
-        'background': ['నేపథ్యం'],
-        'but': ['* ', 'కాని '],
-        'examples': ['ఉదాహరణలు'],
-        'feature': ['గుణము'],
-        'given': ['* ', 'చెప్పబడినది '],
-        'name': 'Telugu',
-        'native': 'తెలుగు',
-        'rule': ['Rule'],
-        'scenario': ['ఉదాహరణ', 'సన్నివేశం'],
-        'scenario_outline': ['కథనం'],
-        'then': ['* ', 'అప్పుడు '],
-        'when': ['* ', 'ఈ పరిస్థితిలో ']},
  'tlh': {'and': ['* ', "'ej ", 'latlh '],
          'background': ["mo'"],
          'but': ['* ', "'ach ", "'a "],