diff --git a/vertigo-core/src/test/java/io/vertigo/core/locale/LocaleManagerTest.java b/vertigo-core/src/test/java/io/vertigo/core/locale/LocaleManagerTest.java index 058a9cde66..59cb566afb 100644 --- a/vertigo-core/src/test/java/io/vertigo/core/locale/LocaleManagerTest.java +++ b/vertigo-core/src/test/java/io/vertigo/core/locale/LocaleManagerTest.java @@ -76,6 +76,8 @@ public void testOverride() { final LocaleMessageText helloTxt = LocaleMessageText.of(CityGuide.HELLO); assertEquals("salut", helloTxt.getDisplay()); + + assertEquals("yah2", localeManager.getMessage(CityGuide.HELLO, Locale.ENGLISH)); } @Test diff --git a/vertigo-core/src/test/java/io/vertigo/core/locale/data/city-guide.properties b/vertigo-core/src/test/java/io/vertigo/core/locale/data/city-guide.properties index 702c229df1..cd02536504 100644 --- a/vertigo-core/src/test/java/io/vertigo/core/locale/data/city-guide.properties +++ b/vertigo-core/src/test/java/io/vertigo/core/locale/data/city-guide.properties @@ -18,6 +18,6 @@ # #Expressions -HELLO = yah -GOOD_BYE = bye -CITY = town +HELLO = hello +GOOD_BYE = good bye +CITY = city diff --git a/vertigo-core/src/test/java/io/vertigo/core/locale/data/city-guide_en.properties b/vertigo-core/src/test/java/io/vertigo/core/locale/data/city-guide_en.properties index ab0e1d5778..0afa721f95 100644 --- a/vertigo-core/src/test/java/io/vertigo/core/locale/data/city-guide_en.properties +++ b/vertigo-core/src/test/java/io/vertigo/core/locale/data/city-guide_en.properties @@ -1,23 +1 @@ -# -# vertigo - simple java starter -# -# Copyright (C) 2013, KleeGroup, direction.technique@kleegroup.com (http://www.kleegroup.com) -# KleeGroup, Centre d'affaire la Boursidiere - BP 159 - 92357 Le Plessis Robinson Cedex - France -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -#Expressions en anglais -HELLO = hello -GOOD_BYE = good bye -CITY = city +# Inherit from city-guide.properties \ No newline at end of file diff --git a/vertigo-core/src/test/java/io/vertigo/core/locale/data/city-guide_fr_FR.properties b/vertigo-core/src/test/java/io/vertigo/core/locale/data/city-guide_fr.properties similarity index 96% rename from vertigo-core/src/test/java/io/vertigo/core/locale/data/city-guide_fr_FR.properties rename to vertigo-core/src/test/java/io/vertigo/core/locale/data/city-guide_fr.properties index 84a0a4da78..ea3c080ef4 100644 --- a/vertigo-core/src/test/java/io/vertigo/core/locale/data/city-guide_fr_FR.properties +++ b/vertigo-core/src/test/java/io/vertigo/core/locale/data/city-guide_fr.properties @@ -17,7 +17,7 @@ # limitations under the License. # -#Expressions en français +#Expressions en français HELLO = bonjour GOOD_BYE = au revoir CITY = ville diff --git a/vertigo-core/src/test/java/io/vertigo/core/locale/data/polpular-guide.properties b/vertigo-core/src/test/java/io/vertigo/core/locale/data/popular-guide.properties similarity index 98% rename from vertigo-core/src/test/java/io/vertigo/core/locale/data/polpular-guide.properties rename to vertigo-core/src/test/java/io/vertigo/core/locale/data/popular-guide.properties index 70528192a9..966c0d4ec2 100644 --- a/vertigo-core/src/test/java/io/vertigo/core/locale/data/polpular-guide.properties +++ b/vertigo-core/src/test/java/io/vertigo/core/locale/data/popular-guide.properties @@ -18,4 +18,4 @@ # #Expressions -HELLO = yah +HELLO = yah2 diff --git a/vertigo-core/src/test/java/io/vertigo/core/locale/data/popular-guide_en.properties b/vertigo-core/src/test/java/io/vertigo/core/locale/data/popular-guide_en.properties new file mode 100644 index 0000000000..df53c59cc7 --- /dev/null +++ b/vertigo-core/src/test/java/io/vertigo/core/locale/data/popular-guide_en.properties @@ -0,0 +1 @@ +# Inherit from popular-guide.properties \ No newline at end of file diff --git a/vertigo-core/src/test/java/io/vertigo/core/locale/data/popular-guide_fr_FR.properties b/vertigo-core/src/test/java/io/vertigo/core/locale/data/popular-guide_fr_FR.properties index c8e1d41db6..a075b806f3 100644 --- a/vertigo-core/src/test/java/io/vertigo/core/locale/data/popular-guide_fr_FR.properties +++ b/vertigo-core/src/test/java/io/vertigo/core/locale/data/popular-guide_fr_FR.properties @@ -17,5 +17,5 @@ # limitations under the License. # -#Expressions en français +#Expressions en français HELLO = salut