Merge branch 'master' of https://github.com/iulianu/gherkin

JonKruger · Jan 2, 2011 · 7fe0b78 · 7fe0b78
2 parents 3a673de + 76f9e4f
commit 7fe0b78
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 65 deletions.
diff --git a/lib/gherkin/i18n.yml b/lib/gherkin/i18n.yml
@@ -433,28 +433,15 @@
 "ro":
   name: Romanian
   native: română
-  background: Conditii
-  feature: Functionalitate
+  background: Context
+  feature: Functionalitate|Funcționalitate|Funcţionalitate
   scenario: Scenariu
-  scenario_outline: Scenariul de sablon
-  examples: Exemplele
-  given: "*|Daca"
-  when: "*|Cand"
+  scenario_outline: Structura scenariu|Structură scenariu
+  examples: Exemple
+  given: "*|Date fiind|Dat fiind|Dati fiind|Dați fiind|Daţi fiind"
+  when: "*|Cand|Când"
   then: "*|Atunci"
-  and: "*|Si"
-  but: "*|Dar"
-"ro-RO":
-  name: Romanian (diacritical)
-  native: română (diacritical)
-  background: Condiţii
-  feature: Funcționalitate
-  scenario: Scenariu
-  scenario_outline: Scenariul de şablon
-  examples: Exemplele
-  given: "*|Dacă"
-  when: "*|Când"
-  then: "*|Atunci"
-  and: "*|Și"
+  and: "*|Si|Și|Şi"
   but: "*|Dar"
 "ru":
   name: Russian

diff --git a/spec/gherkin/i18n_spec.rb b/spec/gherkin/i18n_spec.rb
@@ -79,51 +79,50 @@ def scan_file(lexer, file)
         unless defined?(JRUBY_VERSION)
         it "should print available languages" do
           ("\n" + Gherkin::I18n.language_table).should == %{
-      | ar        | Arabic                 | العربية              |
-      | bg        | Bulgarian              | български            |
-      | ca        | Catalan                | català               |
-      | cs        | Czech                  | Česky                |
-      | cy-GB     | Welsh                  | Cymraeg              |
-      | da        | Danish                 | dansk                |
-      | de        | German                 | Deutsch              |
-      | en        | English                | English              |
-      | en-Scouse | Scouse                 | Scouse               |
-      | en-au     | Australian             | Australian           |
-      | en-lol    | LOLCAT                 | LOLCAT               |
-      | en-pirate | Pirate                 | Pirate               |
-      | en-tx     | Texan                  | Texan                |
-      | eo        | Esperanto              | Esperanto            |
-      | es        | Spanish                | español              |
-      | et        | Estonian               | eesti keel           |
-      | fi        | Finnish                | suomi                |
-      | fr        | French                 | français             |
-      | he        | Hebrew                 | עברית                |
-      | hr        | Croatian               | hrvatski             |
-      | hu        | Hungarian              | magyar               |
-      | id        | Indonesian             | Bahasa Indonesia     |
-      | it        | Italian                | italiano             |
-      | ja        | Japanese               | 日本語                  |
-      | ko        | Korean                 | 한국어                  |
-      | lt        | Lithuanian             | lietuvių kalba       |
-      | lu        | Luxemburgish           | Lëtzebuergesch       |
-      | lv        | Latvian                | latviešu             |
-      | nl        | Dutch                  | Nederlands           |
-      | no        | Norwegian              | norsk                |
-      | pl        | Polish                 | polski               |
-      | pt        | Portuguese             | português            |
-      | ro        | Romanian               | română               |
-      | ro-RO     | Romanian (diacritical) | română (diacritical) |
-      | ru        | Russian                | русский              |
-      | sk        | Slovak                 | Slovensky            |
-      | sr-Cyrl   | Serbian                | Српски               |
-      | sr-Latn   | Serbian (Latin)        | Srpski (Latinica)    |
-      | sv        | Swedish                | Svenska              |
-      | tr        | Turkish                | Türkçe               |
-      | uk        | Ukrainian              | Українська           |
-      | uz        | Uzbek                  | Узбекча              |
-      | vi        | Vietnamese             | Tiếng Việt           |
-      | zh-CN     | Chinese simplified     | 简体中文                 |
-      | zh-TW     | Chinese traditional    | 繁體中文                 |
+      | ar        | Arabic              | العربية           |
+      | bg        | Bulgarian           | български         |
+      | ca        | Catalan             | català            |
+      | cs        | Czech               | Česky             |
+      | cy-GB     | Welsh               | Cymraeg           |
+      | da        | Danish              | dansk             |
+      | de        | German              | Deutsch           |
+      | en        | English             | English           |
+      | en-Scouse | Scouse              | Scouse            |
+      | en-au     | Australian          | Australian        |
+      | en-lol    | LOLCAT              | LOLCAT            |
+      | en-pirate | Pirate              | Pirate            |
+      | en-tx     | Texan               | Texan             |
+      | eo        | Esperanto           | Esperanto         |
+      | es        | Spanish             | español           |
+      | et        | Estonian            | eesti keel        |
+      | fi        | Finnish             | suomi             |
+      | fr        | French              | français          |
+      | he        | Hebrew              | עברית             |
+      | hr        | Croatian            | hrvatski          |
+      | hu        | Hungarian           | magyar            |
+      | id        | Indonesian          | Bahasa Indonesia  |
+      | it        | Italian             | italiano          |
+      | ja        | Japanese            | 日本語               |
+      | ko        | Korean              | 한국어               |
+      | lt        | Lithuanian          | lietuvių kalba    |
+      | lu        | Luxemburgish        | Lëtzebuergesch    |
+      | lv        | Latvian             | latviešu          |
+      | nl        | Dutch               | Nederlands        |
+      | no        | Norwegian           | norsk             |
+      | pl        | Polish              | polski            |
+      | pt        | Portuguese          | português         |
+      | ro        | Romanian            | română            |
+      | ru        | Russian             | русский           |
+      | sk        | Slovak              | Slovensky         |
+      | sr-Cyrl   | Serbian             | Српски            |
+      | sr-Latn   | Serbian (Latin)     | Srpski (Latinica) |
+      | sv        | Swedish             | Svenska           |
+      | tr        | Turkish             | Türkçe            |
+      | uk        | Ukrainian           | Українська        |
+      | uz        | Uzbek               | Узбекча           |
+      | vi        | Vietnamese          | Tiếng Việt        |
+      | zh-CN     | Chinese simplified  | 简体中文              |
+      | zh-TW     | Chinese traditional | 繁體中文              |
 }
         end
         end