Merge branch 'master' of github.com:punjab/gherkin

anay · Aug 10, 2013 · a37ebc8 · a37ebc8
2 parents 76efd68 + 19acdd7
commit a37ebc8
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/java/src/test/java/gherkin/I18nTest.java b/java/src/test/java/gherkin/I18nTest.java
@@ -21,7 +21,7 @@ public String map(I18n i18n) {
                 return i18n.getIsoCode();
             }
         });
-        assertEquals(asList("ar,bg,bm,ca,cs,cy-GB,da,de,el,en,en-Scouse,en-au,en-lol,en-old,en-pirate,en-tx,eo,es,et,fa,fi,fr,gl,he,hi,hr,hu,id,is,it,ja,ko,lt,lu,lv,nl,no,pl,pt,ro,ru,sk,sr-Cyrl,sr-Latn,sv,th,tl,tr,tt,uk,uz,vi,zh-CN,zh-TW".split(",")), isoCodes);
+        assertEquals(asList("ar,bg,bm,ca,cs,cy-GB,da,de,el,en,en-Scouse,en-au,en-lol,en-old,en-pirate,en-tx,eo,es,et,fa,fi,fr,gl,he,hi,hr,hu,id,is,it,ja,ko,lt,lu,lv,nl,no,pa,pl,pt,ro,ru,sk,sr-Cyrl,sr-Latn,sv,th,tl,tr,tt,uk,uz,vi,zh-CN,zh-TW".split(",")), isoCodes);
     }
 
     @Test

diff --git a/lib/gherkin/i18n.json b/lib/gherkin/i18n.json
@@ -517,6 +517,20 @@
 	  "and": "*|Og",
 	  "but": "*|Men"
 	},
+	"pa": {
+	  "name": "Panjabi",
+	  "native": "ਪੰਜਾਬੀ",
+	  "feature": "ਖਾਸੀਅਤ|ਮੁਹਾਂਦਰਾ|ਨਕਸ਼ ਨੁਹਾਰ",
+	  "background": "ਪਿਛੋਕੜ",
+	  "scenario": "ਪਟਕਥਾ",
+	  "scenario_outline": "ਪਟਕਥਾ ਢਾਂਚਾ|ਪਟਕਥਾ ਰੂਪ ਰੇਖਾ",
+	  "examples": "ਉਦਾਹਰਨਾਂ",
+	  "given": "*|ਜੇਕਰ|ਜਿਵੇਂ ਕਿ",
+	  "when": "*|ਜਦੋਂ",
+	  "then": "*|ਤਦ",
+	  "and": "*|ਅਤੇ",
+	  "but": "*|ਪਰ"
+	},
 	"pl": {
 	  "name": "Polish",
 	  "native": "polski",

diff --git a/spec/gherkin/i18n_spec.rb b/spec/gherkin/i18n_spec.rb
@@ -204,6 +204,7 @@ def scan_file(lexer, file)
       | lv        | Latvian             | latviešu          |
       | nl        | Dutch               | Nederlands        |
       | no        | Norwegian           | norsk             |
+      | pa        | Panjabi             | ਪੰਜਾਬੀ            |
       | pl        | Polish              | polski            |
       | pt        | Portuguese          | português         |
       | ro        | Romanian            | română            |
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,7 +21,7 @@ public String map(I18n i18n) { @@
                     return i18n.getIsoCode();
                 }
             });
-            assertEquals(asList("ar,bg,bm,ca,cs,cy-GB,da,de,el,en,en-Scouse,en-au,en-lol,en-old,en-pirate,en-tx,eo,es,et,fa,fi,fr,gl,he,hi,hr,hu,id,is,it,ja,ko,lt,lu,lv,nl,no,pl,pt,ro,ru,sk,sr-Cyrl,sr-Latn,sv,th,tl,tr,tt,uk,uz,vi,zh-CN,zh-TW".split(",")), isoCodes);
+            assertEquals(asList("ar,bg,bm,ca,cs,cy-GB,da,de,el,en,en-Scouse,en-au,en-lol,en-old,en-pirate,en-tx,eo,es,et,fa,fi,fr,gl,he,hi,hr,hu,id,is,it,ja,ko,lt,lu,lv,nl,no,pa,pl,pt,ro,ru,sk,sr-Cyrl,sr-Latn,sv,th,tl,tr,tt,uk,uz,vi,zh-CN,zh-TW".split(",")), isoCodes);
         }
         @Test
@@ Expand Down @@