Author: tchemit Date: 2010-11-08 11:28:15 +0100 (Mon, 08 Nov 2010) New Revision: 1788 Url: http://nuiton.org/repositories/revision/i18n/1788 Log: Anomalie #1018: Use a resource bundle api compatible name for translation files Added: trunk/nuiton-i18n/src/test/resources/META-INF/I18nStoreTest_en_GB.properties trunk/nuiton-i18n/src/test/resources/META-INF/I18nStoreTest_fr_FR.properties Removed: trunk/nuiton-i18n/src/test/resources/META-INF/I18nStoreTest-en_GB.properties trunk/nuiton-i18n/src/test/resources/META-INF/I18nStoreTest-fr_FR.properties Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/AbstractI18nMojo.java trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/I18nBundleScope.java trunk/nuiton-i18n/src/test/resources/META-INF/I18nStoreTest-definition.properties Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/AbstractI18nMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/AbstractI18nMojo.java 2010-11-08 09:32:44 UTC (rev 1787) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/AbstractI18nMojo.java 2010-11-08 10:28:15 UTC (rev 1788) @@ -199,7 +199,7 @@ Locale locale, boolean create) throws IOException { File file = new File( root.getAbsolutePath() + File.separatorChar + artifactId + - "-" + locale.toString() + ".properties"); + "_" + locale.toString() + ".properties"); if (create && !file.exists()) { createNewFile(file); } Modified: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/I18nBundleScope.java =================================================================== --- trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/I18nBundleScope.java 2010-11-08 09:32:44 UTC (rev 1787) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/I18nBundleScope.java 2010-11-08 10:28:15 UTC (rev 1788) @@ -73,7 +73,7 @@ }, /** language scope (no country information) */ - LANGUAGE("(.*/.+)-(\\w\\w)\\.properties") { + LANGUAGE("(.*/.+)_(\\w\\w)\\.properties") { @Override public Locale getLocale(Matcher matcher) { Locale result = null; @@ -85,7 +85,7 @@ }, /** full scope : language + country */ - FULL("(.*/.+)-(\\w\\w_\\w\\w)\\.properties") { + FULL("(.*/.+)_(\\w\\w_\\w\\w)\\.properties") { @Override public Locale getLocale(Matcher matcher) { Locale result = null; Modified: trunk/nuiton-i18n/src/test/resources/META-INF/I18nStoreTest-definition.properties =================================================================== --- trunk/nuiton-i18n/src/test/resources/META-INF/I18nStoreTest-definition.properties 2010-11-08 09:32:44 UTC (rev 1787) +++ trunk/nuiton-i18n/src/test/resources/META-INF/I18nStoreTest-definition.properties 2010-11-08 10:28:15 UTC (rev 1788) @@ -23,6 +23,6 @@ # #L% ### #Sun Mar 07 00:23:58 CET 2010 -bundles.en_GB=bundleTest/I18nStoreTest-en_GB.properties -bundles.fr_FR=bundleTest/I18nStoreTest-fr_FR.properties +bundles.en_GB=bundleTest/I18nStoreTest_en_GB.properties +bundles.fr_FR=bundleTest/I18nStoreTest_fr_FR.properties locales=fr_FR,en_GB Deleted: trunk/nuiton-i18n/src/test/resources/META-INF/I18nStoreTest-en_GB.properties =================================================================== --- trunk/nuiton-i18n/src/test/resources/META-INF/I18nStoreTest-en_GB.properties 2010-11-08 09:32:44 UTC (rev 1787) +++ trunk/nuiton-i18n/src/test/resources/META-INF/I18nStoreTest-en_GB.properties 2010-11-08 10:28:15 UTC (rev 1788) @@ -1,26 +0,0 @@ -### -# #%L -# I18n :: Api -# -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2004 - 2010 CodeLutin -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Lesser Public License for more details. -# -# You should have received a copy of the GNU General Lesser Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/lgpl-3.0.html>. -# #L% -### -key.one=First -key.two=Second Deleted: trunk/nuiton-i18n/src/test/resources/META-INF/I18nStoreTest-fr_FR.properties =================================================================== --- trunk/nuiton-i18n/src/test/resources/META-INF/I18nStoreTest-fr_FR.properties 2010-11-08 09:32:44 UTC (rev 1787) +++ trunk/nuiton-i18n/src/test/resources/META-INF/I18nStoreTest-fr_FR.properties 2010-11-08 10:28:15 UTC (rev 1788) @@ -1,26 +0,0 @@ -### -# #%L -# I18n :: Api -# -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2004 - 2010 CodeLutin -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Lesser Public License for more details. -# -# You should have received a copy of the GNU General Lesser Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/lgpl-3.0.html>. -# #L% -### -key.one=Premier -key.two=Seconde Copied: trunk/nuiton-i18n/src/test/resources/META-INF/I18nStoreTest_en_GB.properties (from rev 1786, trunk/nuiton-i18n/src/test/resources/META-INF/I18nStoreTest-en_GB.properties) =================================================================== --- trunk/nuiton-i18n/src/test/resources/META-INF/I18nStoreTest_en_GB.properties (rev 0) +++ trunk/nuiton-i18n/src/test/resources/META-INF/I18nStoreTest_en_GB.properties 2010-11-08 10:28:15 UTC (rev 1788) @@ -0,0 +1,26 @@ +### +# #%L +# I18n :: Api +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2004 - 2010 CodeLutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Lesser Public License for more details. +# +# You should have received a copy of the GNU General Lesser Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/lgpl-3.0.html>. +# #L% +### +key.one=First +key.two=Second Property changes on: trunk/nuiton-i18n/src/test/resources/META-INF/I18nStoreTest_en_GB.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Copied: trunk/nuiton-i18n/src/test/resources/META-INF/I18nStoreTest_fr_FR.properties (from rev 1786, trunk/nuiton-i18n/src/test/resources/META-INF/I18nStoreTest-fr_FR.properties) =================================================================== --- trunk/nuiton-i18n/src/test/resources/META-INF/I18nStoreTest_fr_FR.properties (rev 0) +++ trunk/nuiton-i18n/src/test/resources/META-INF/I18nStoreTest_fr_FR.properties 2010-11-08 10:28:15 UTC (rev 1788) @@ -0,0 +1,26 @@ +### +# #%L +# I18n :: Api +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2004 - 2010 CodeLutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Lesser Public License for more details. +# +# You should have received a copy of the GNU General Lesser Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/lgpl-3.0.html>. +# #L% +### +key.one=Premier +key.two=Seconde Property changes on: trunk/nuiton-i18n/src/test/resources/META-INF/I18nStoreTest_fr_FR.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL