deac/middleman
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #917 from joallard/i18n_pages

Browse source 
Fix #823-2 to allow only one extension on localized views
This commit is contained in:
Ben Hollis 2013-05-30 18:39:13 -07:00
commit 474b56ae25
6 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
middleman-core/features/i18n_builder.feature
View file

@ -13,9 +13,11 @@ Feature: i18n Builder
| index.html |
| hello.html |
| morning.html |
| one.html |
| es/index.html |
| es/hola.html |
| es/manana.html |
| es/una.html |
| CNAME |
| password.txt |
Then the following files should not exist:
@ -23,9 +25,11 @@ Feature: i18n Builder
And the file "index.html" should contain "Howdy"
And the file "hello.html" should contain "Hello World"
And the file "morning.html" should contain "Good morning"
And the file "one.html" should contain "Only one"
And the file "es/index.html" should contain "Como Esta?"
And the file "es/hola.html" should contain "Hola World"
And the file "es/manana.html" should contain "Buenos días"
And the file "es/una.html" should contain "Solamente una"
And the file "CNAME" should contain "test.github.com"
And the file "password.txt" should contain "hunter2"
@ -145,4 +149,4 @@ Feature: i18n Builder
And the file "index.html" should contain '"stylesheets/site.css"'
And the file "hello.html" should contain '"stylesheets/site.css"'
And the file "es/index.html" should contain '"../stylesheets/site.css"'
And the file "es/hola.html" should contain '"../stylesheets/site.css"'
And the file "es/hola.html" should contain '"../stylesheets/site.css"'

6
middleman-core/features/i18n_preview.feature
View file

@ -14,6 +14,8 @@ Feature: i18n Preview
Then I should see "Hello World"
When I go to "/morning.html"
Then I should see "Good morning"
When I go to "/one.html"
Then I should see "Only one"
When I go to "/en/index.html"
Then I should see "File Not Found"
When I go to "/en/morning.html"
@ -24,6 +26,8 @@ Feature: i18n Preview
Then I should see "Hola World"
When I go to "/es/manana.html"
Then I should see "Buenos días"
When I go to "/es/una.html"
Then I should see "Solamente una"
Scenario: A template changes i18n during preview
Given a fixture app "i18n-test-app"
@ -241,4 +245,4 @@ Feature: i18n Preview
Then I should see "More"
When I go to "/es/"
Then I should see "Como Esta?"
Then I should see "Mucho"
Then I should see "Mucho"

1
middleman-core/fixtures/i18n-test-app/locales/es.yml
View file

@ -3,6 +3,7 @@ es:
paths:
hello: "hola"
morning: "manana"
one: "una"
greetings: "Como Esta?"
hi: "Hola"

1
middleman-core/fixtures/i18n-test-app/source/one.en.md Normal file
View file

@ -0,0 +1 @@
Only one

1
middleman-core/fixtures/i18n-test-app/source/one.es.md Normal file
View file

@ -0,0 +1 @@
Solamente una

2
middleman-core/lib/middleman-core/sitemap/store.rb
View file

@ -250,7 +250,7 @@ module Middleman
path_bits = path.split('.')
lang = path_bits.last
if app.langs.include?(lang.to_sym)
return path_bits[0..-1].join('.')
return path_bits[0..-2].join('.')
end
end