Added I18n.getLocale() to Java impl. Release 2.4.7.

Author: aslakhellesoy

.rbenv-gemsets

@@ -0,0 +1 @@
+cucumber

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gherkin (2.4.6)
+    gherkin (2.4.7)
       json (>= 1.4.6)
 
 GEM
@@ -32,7 +32,7 @@ GEM
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
     term-ansicolor (1.0.6)
-    therubyracer (0.9.2)
+    therubyracer (0.9.3)
       libv8 (~> 3.3.10)
     yard (0.7.2)
 
@@ -43,13 +43,13 @@ PLATFORMS
 DEPENDENCIES
   awesome_print (>= 0.4.0)
   builder (>= 2.1.2)
-  bundler (>= 1.0.15)
+  bundler (>= 1.0.18)
   cucumber (>= 1.0.2)
   gherkin!
   rake (>= 0.9.2)
   rake-compiler (>= 0.7.8)
   rdiscount (>= 1.6.8)
   rspec (>= 2.6.0)
   term-ansicolor (>= 1.0.6)
-  therubyracer (>= 0.9.2)
+  therubyracer (>= 0.9.3)
   yard (>= 0.7.2)

History.md

@@ -1,3 +1,9 @@
+## [2.4.6](https://github.com/cucumber/gherkin/compare/v2.4.6...v2.4.7)
+
+### New Features
+
+* Added I18n.getLocale() to Java impl. (Aslak Hellesøy)
+
 ## [2.4.6](https://github.com/cucumber/gherkin/compare/v2.4.5...v2.4.6)
 
 ### Bugfixes

README.md

@@ -139,17 +139,19 @@ Make sure you have openssl installed first.
     rvm gemset create cucumber
     rvm use @cucumber
     gem install bundler
+    unset GHERKIN_JS
     bundle install
     rake-compiler cross-ruby VERSION=1.8.6-p287
 
     # 1.9.1
     # Later 1.9.1 patch levels or 1.9.2 don't compile on mingw.
     # The compiled binaries should still work on 1.9.2
-    rvm install 1.9.1-p243
-    rvm use 1.9.1-p243
+    rvm install 1.9.1-p378
+    rvm use 1.9.1-p378
     rvm gemset create cucumber
     rvm use @cucumber
     gem install bundler
+    unset GHERKIN_JS
     bundle install
     rake-compiler cross-ruby VERSION=1.9.1-p243
 

gherkin.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = "gherkin"
-  s.version     = "2.4.6"
+  s.version     = "2.4.7"
   s.authors     = ["Mike Sassak", "Gregory Hnatiuk", "Aslak Hellesøy"]
   s.description = "A fast Gherkin lexer/parser for based on the Ragel State Machine Compiler."
   s.summary     = "#{s.name}-#{s.version}"
@@ -46,12 +46,12 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency('cucumber', '>= 1.0.2')
   s.add_development_dependency('rake', '>= 0.9.2')
-  s.add_development_dependency('bundler', '>= 1.0.15')
+  s.add_development_dependency('bundler', '>= 1.0.18')
   s.add_development_dependency('rspec', '>= 2.6.0')
   s.add_development_dependency('awesome_print', '>= 0.4.0')
 
   unless ENV['RUBY_CC_VERSION'] || defined?(JRUBY_VERSION)
-    s.add_development_dependency('therubyracer', '>= 0.9.2') if ENV['GHERKIN_JS']
+    s.add_development_dependency('therubyracer', '>= 0.9.3') if ENV['GHERKIN_JS']
     # For Documentation:
     s.add_development_dependency('yard', '>= 0.7.2')
     s.add_development_dependency('rdiscount', '>= 1.6.8')

ikvm/Gherkin/Gherkin.csproj

@@ -43,9 +43,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\release\IKVM.OpenJDK.Text.dll</HintPath>
     </Reference>
-    <Reference Include="gherkin-2.4.6, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+    <Reference Include="gherkin-2.4.7, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\release\gherkin-2.4.6.dll</HintPath>
+      <HintPath>..\..\release\gherkin-2.4.7.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

java/Gherkin.iml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">

java/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>gherkin</groupId>
     <artifactId>gherkin</artifactId>
-    <version>2.4.6</version>
+    <version>2.4.7</version>
 
     <packaging>jar</packaging>
     <name>Gherkin</name>
@@ -77,8 +77,8 @@
                     <artifactId>maven-compiler-plugin</artifactId>
                     <configuration>
                         <encoding>UTF-8</encoding>
-                        <source>1.5</source>
-                        <target>1.5</target>
+                        <source>1.6</source>
+                        <target>1.6</target>
                     </configuration>
                 </plugin>
                 <plugin>

java/src/main/java/gherkin/I18n.java

@@ -67,6 +67,10 @@ private void populateKeywords() {
     public String getIsoCode() {
         return isoCode;
     }
+    
+    public Locale getLocale() {
+        return locale;
+    }
 
     public String getUnderscoredIsoCode() {
         return getIsoCode().replaceAll("[\\s-]", "_").toLowerCase();

js/package.json

@@ -1,7 +1,7 @@
 { "name" : "gherkin"
 , "description" : "A fast Gherkin lexer/parser based on the Ragel State Machine Compiler."
 , "keywords" : [ "testing", "bdd", "cucumber", "gherkin", "tests" ]
-, "version" : "2.4.6"
+, "version" : "2.4.7"
 , "homepage" : "http://github.com/cucumber/gherkin"
 , "author" : "Aslak Hellesøy <[email protected]>"
 , "contributors" : [ "Aslak Hellesøy <[email protected]>" ]