On Tue, Nov 22, 2011 at 9:32 AM, <svenme...@apache.org> wrote: > Author: svenmeier > Date: Tue Nov 22 07:32:09 2011 > New Revision: 1204836 > > URL: http://svn.apache.org/viewvc?rev=1204836&view=rev > Log: > WICKET-4162 let initializers provide localizations > > Added: > > wicket/trunk/wicket-core/src/main/java/org/apache/wicket/resource/loader/InitializerStringResourceLoader.java > (with props) > > wicket/trunk/wicket-core/src/test/java/org/apache/wicket/resource/loader/FooInitializer.java > (with props) > > wicket/trunk/wicket-core/src/test/java/org/apache/wicket/resource/loader/FooInitializer.properties > (with props) > > wicket/trunk/wicket-core/src/test/java/org/apache/wicket/resource/loader/FooInitializer_alt.properties > (with props) > > wicket/trunk/wicket-core/src/test/java/org/apache/wicket/resource/loader/FooInitializer_zz.properties > (with props) > > wicket/trunk/wicket-core/src/test/java/org/apache/wicket/resource/loader/InitializerStringResourceLoaderTest.java > (with props) > > wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/Initializer.properties > (with props) > > wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/Initializer_de.properties > (with props) > > wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/Initializer_fr.properties.xml > (with props) > Removed: > > wicket/trunk/wicket-core/src/main/java/org/apache/wicket/resource/loader/JarStringResourceLoader.java > > wicket/trunk/wicket-core/src/test/java/org/apache/wicket/resource/loader/JarStringResourceLoaderTest.java > wicket/trunk/wicket-core/src/test/java/wicket-jar.properties > wicket/trunk/wicket-core/src/test/java/wicket-jar_fr.properties.xml > wicket/trunk/wicket-extensions/src/main/java/wicket-jar.properties > wicket/trunk/wicket-extensions/src/main/java/wicket-jar_de.properties > wicket/trunk/wicket-extensions/src/main/java/wicket-jar_fr.properties.xml > Modified: > wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Application.java > > wicket/trunk/wicket-core/src/main/java/org/apache/wicket/settings/def/ResourceSettings.java > > wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ApplicationSettingsTest.java > > wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadStatusResource.java > > Modified: > wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Application.java > URL: > http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Application.java?rev=1204836&r1=1204835&r2=1204836&view=diff > ============================================================================== > --- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Application.java > (original) > +++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Application.java > Tue Nov 22 07:32:09 2011 > @@ -923,6 +923,14 @@ public abstract class Application implem > } > > /** > + * @return collection of initializers > + */ > + public final List<IInitializer> getInitializers() > + { > + return initializers;
Isn't it better to return unmodifieable list here ? > + } > + > + /** > * @return collection of application listeners > */ > public final ApplicationListenerCollection getApplicationListeners() > > Added: > wicket/trunk/wicket-core/src/main/java/org/apache/wicket/resource/loader/InitializerStringResourceLoader.java > URL: > http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/resource/loader/InitializerStringResourceLoader.java?rev=1204836&view=auto > ============================================================================== > --- > wicket/trunk/wicket-core/src/main/java/org/apache/wicket/resource/loader/InitializerStringResourceLoader.java > (added) > +++ > wicket/trunk/wicket-core/src/main/java/org/apache/wicket/resource/loader/InitializerStringResourceLoader.java > Tue Nov 22 07:32:09 2011 > @@ -0,0 +1,94 @@ > +/* > + * Licensed to the Apache Software Foundation (ASF) under one or more > + * contributor license agreements. See the NOTICE file distributed with > + * this work for additional information regarding copyright ownership. > + * The ASF licenses this file to You 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. > + */ > +package org.apache.wicket.resource.loader; > + > +import java.util.List; > +import java.util.Locale; > + > +import org.apache.wicket.Component; > +import org.apache.wicket.IInitializer; > +import org.slf4j.Logger; > +import org.slf4j.LoggerFactory; > + > + > +/** > + * This is one of Wicket's default string resource loaders. It is designed > to let wicket extension > + * modules contribute default resource bundles for their components. > + * <p> > + * The initializer based string resource loader attempts to find the > resource from a bundle that > + * corresponds to the supplied wicket initializers. > + * <p> > + * This implementation is fully aware of both locale and style values when > trying to obtain the > + * appropriate resources. > + * <p> > + * > + * @author Bertrand Guay-Paquet > + * @author Sven Meier > + */ > +public class InitializerStringResourceLoader extends > ComponentStringResourceLoader > +{ > + /** Log. */ > + private static final Logger log = > LoggerFactory.getLogger(InitializerStringResourceLoader.class); > + > + private List<IInitializer> initializers; > + > + /** > + * Create and initialize the resource loader. > + * > + * @param initializers > + * initializers > + */ > + public InitializerStringResourceLoader(List<IInitializer> > initializers) > + { > + this.initializers = initializers; > + } > + > + /** > + * > + * @see > org.apache.wicket.resource.loader.ComponentStringResourceLoader#loadStringResource(java.lang.Class, > + * java.lang.String, java.util.Locale, java.lang.String, > java.lang.String) > + */ > + @Override > + public String loadStringResource(Class<?> clazz, final String key, > final Locale locale, > + final String style, final String variation) > + { > + > + for (IInitializer initializer : initializers) > + { > + String string = > super.loadStringResource(initializer.getClass(), key, locale, style, > + variation); > + if (string != null) > + { > + return string; > + } > + } > + > + // not found > + return null; > + } > + > + /** > + * @see > org.apache.wicket.resource.loader.ComponentStringResourceLoader#loadStringResource(org.apache.wicket.Component, > + * java.lang.String, java.util.Locale, java.lang.String, > java.lang.String) > + */ > + @Override > + public String loadStringResource(final Component component, final > String key, > + final Locale locale, final String style, final String > variation) > + { > + return loadStringResource((Class<?>)null, key, locale, style, > variation); > + } > +} > \ No newline at end of file > > Propchange: > wicket/trunk/wicket-core/src/main/java/org/apache/wicket/resource/loader/InitializerStringResourceLoader.java > ------------------------------------------------------------------------------ > svn:mime-type = text/plain > > Modified: > wicket/trunk/wicket-core/src/main/java/org/apache/wicket/settings/def/ResourceSettings.java > URL: > http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/settings/def/ResourceSettings.java?rev=1204836&r1=1204835&r2=1204836&view=diff > ============================================================================== > --- > wicket/trunk/wicket-core/src/main/java/org/apache/wicket/settings/def/ResourceSettings.java > (original) > +++ > wicket/trunk/wicket-core/src/main/java/org/apache/wicket/settings/def/ResourceSettings.java > Tue Nov 22 07:32:09 2011 > @@ -40,7 +40,7 @@ import org.apache.wicket.resource.Proper > import org.apache.wicket.resource.loader.ClassStringResourceLoader; > import org.apache.wicket.resource.loader.ComponentStringResourceLoader; > import org.apache.wicket.resource.loader.IStringResourceLoader; > -import org.apache.wicket.resource.loader.JarStringResourceLoader; > +import org.apache.wicket.resource.loader.InitializerStringResourceLoader; > import org.apache.wicket.resource.loader.PackageStringResourceLoader; > import org.apache.wicket.resource.loader.ValidatorStringResourceLoader; > import org.apache.wicket.settings.IResourceSettings; > @@ -159,11 +159,10 @@ public class ResourceSettings implements > * </ul> > * </dd> > * <dt>validator specific</dt> > - * <dt>jar specific</dt> > + * <dt>Initializer specific</dt> > * <dd> > * <ul> > - * <li>wicket-jar.properties (in jar containing Foo)</li> > - * <li>wicket-jar.properties (in jar containing Component)</li> > + * <li>bar.Foo.properties (Foo implementing IInitializer)</li> > * </ul> > * </dd> > * </dl> > @@ -177,7 +176,7 @@ public class ResourceSettings implements > stringResourceLoaders.add(new PackageStringResourceLoader()); > stringResourceLoaders.add(new > ClassStringResourceLoader(application.getClass())); > stringResourceLoaders.add(new ValidatorStringResourceLoader()); > - stringResourceLoaders.add(new JarStringResourceLoader()); > + stringResourceLoaders.add(new > InitializerStringResourceLoader(application.getInitializers())); > } > > /** > > Modified: > wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ApplicationSettingsTest.java > URL: > http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ApplicationSettingsTest.java?rev=1204836&r1=1204835&r2=1204836&view=diff > ============================================================================== > --- > wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ApplicationSettingsTest.java > (original) > +++ > wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ApplicationSettingsTest.java > Tue Nov 22 07:32:09 2011 > @@ -28,7 +28,7 @@ import org.apache.wicket.resource.loader > import org.apache.wicket.resource.loader.ClassStringResourceLoader; > import org.apache.wicket.resource.loader.ComponentStringResourceLoader; > import org.apache.wicket.resource.loader.IStringResourceLoader; > -import org.apache.wicket.resource.loader.JarStringResourceLoader; > +import org.apache.wicket.resource.loader.InitializerStringResourceLoader; > import org.apache.wicket.resource.loader.PackageStringResourceLoader; > import org.apache.wicket.resource.loader.ValidatorStringResourceLoader; > import org.apache.wicket.settings.IFrameworkSettings; > @@ -128,8 +128,8 @@ public class ApplicationSettingsTest > loaders.get(2) instanceof ClassStringResourceLoader); > Assert.assertTrue("Fourth loader should be the validator one", > loaders.get(3) instanceof > ValidatorStringResourceLoader); > - Assert.assertTrue("Fifth should be the classpath one", > - loaders.get(4) instanceof JarStringResourceLoader); > + Assert.assertTrue("Fifth should be the initializer one", > + loaders.get(4) instanceof > InitializerStringResourceLoader); > } > > /** > > Added: > wicket/trunk/wicket-core/src/test/java/org/apache/wicket/resource/loader/FooInitializer.java > URL: > http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/resource/loader/FooInitializer.java?rev=1204836&view=auto > ============================================================================== > --- > wicket/trunk/wicket-core/src/test/java/org/apache/wicket/resource/loader/FooInitializer.java > (added) > +++ > wicket/trunk/wicket-core/src/test/java/org/apache/wicket/resource/loader/FooInitializer.java > Tue Nov 22 07:32:09 2011 > @@ -0,0 +1,34 @@ > +/* > + * Licensed to the Apache Software Foundation (ASF) under one or more > + * contributor license agreements. See the NOTICE file distributed with > + * this work for additional information regarding copyright ownership. > + * The ASF licenses this file to You 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. > + */ > +package org.apache.wicket.resource.loader; > + > +import org.apache.wicket.Application; > +import org.apache.wicket.IInitializer; > + > +/** > + * > + */ > +public class FooInitializer implements IInitializer > +{ > + public void init(Application application) > + { > + } > + > + public void destroy(Application application) > + { > + } > +} > > Propchange: > wicket/trunk/wicket-core/src/test/java/org/apache/wicket/resource/loader/FooInitializer.java > ------------------------------------------------------------------------------ > svn:mime-type = text/plain > > Added: > wicket/trunk/wicket-core/src/test/java/org/apache/wicket/resource/loader/FooInitializer.properties > URL: > http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/resource/loader/FooInitializer.properties?rev=1204836&view=auto > ============================================================================== > --- > wicket/trunk/wicket-core/src/test/java/org/apache/wicket/resource/loader/FooInitializer.properties > (added) > +++ > wicket/trunk/wicket-core/src/test/java/org/apache/wicket/resource/loader/FooInitializer.properties > Tue Nov 22 07:32:09 2011 > @@ -0,0 +1,20 @@ > +# > +# $Id: DummyApplication.properties 908348 2010-02-10 04:26:40Z ivaynberg $ > +# $Revision: 908348 $ > +# $Date: 2010-02-10 05:26:40 +0100 (Mi, 10. Feb 2010) $ > +# > +# ==================================================================== > +# 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. > +# > +test.string=This is a test > +test.substitute=Welcome, ${user} > > Propchange: > wicket/trunk/wicket-core/src/test/java/org/apache/wicket/resource/loader/FooInitializer.properties > ------------------------------------------------------------------------------ > svn:mime-type = text/plain > > Added: > wicket/trunk/wicket-core/src/test/java/org/apache/wicket/resource/loader/FooInitializer_alt.properties > URL: > http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/resource/loader/FooInitializer_alt.properties?rev=1204836&view=auto > ============================================================================== > --- > wicket/trunk/wicket-core/src/test/java/org/apache/wicket/resource/loader/FooInitializer_alt.properties > (added) > +++ > wicket/trunk/wicket-core/src/test/java/org/apache/wicket/resource/loader/FooInitializer_alt.properties > Tue Nov 22 07:32:09 2011 > @@ -0,0 +1,19 @@ > +# > +# $Id: DummyApplication_alt.properties 908348 2010-02-10 04:26:40Z ivaynberg > $ > +# $Revision: 908348 $ > +# $Date: 2010-02-10 05:26:40 +0100 (Mi, 10. Feb 2010) $ > +# > +# ==================================================================== > +# 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. > +# > +test.string=Alt test string > > Propchange: > wicket/trunk/wicket-core/src/test/java/org/apache/wicket/resource/loader/FooInitializer_alt.properties > ------------------------------------------------------------------------------ > svn:mime-type = text/plain > > Added: > wicket/trunk/wicket-core/src/test/java/org/apache/wicket/resource/loader/FooInitializer_zz.properties > URL: > http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/resource/loader/FooInitializer_zz.properties?rev=1204836&view=auto > ============================================================================== > --- > wicket/trunk/wicket-core/src/test/java/org/apache/wicket/resource/loader/FooInitializer_zz.properties > (added) > +++ > wicket/trunk/wicket-core/src/test/java/org/apache/wicket/resource/loader/FooInitializer_zz.properties > Tue Nov 22 07:32:09 2011 > @@ -0,0 +1,19 @@ > +# > +# $Id: DummyApplication_zz.properties 908348 2010-02-10 04:26:40Z ivaynberg $ > +# $Revision: 908348 $ > +# $Date: 2010-02-10 05:26:40 +0100 (Mi, 10. Feb 2010) $ > +# > +# ==================================================================== > +# 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. > +# > +test.string=Flib flob > > Propchange: > wicket/trunk/wicket-core/src/test/java/org/apache/wicket/resource/loader/FooInitializer_zz.properties > ------------------------------------------------------------------------------ > svn:mime-type = text/plain > > Added: > wicket/trunk/wicket-core/src/test/java/org/apache/wicket/resource/loader/InitializerStringResourceLoaderTest.java > URL: > http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/resource/loader/InitializerStringResourceLoaderTest.java?rev=1204836&view=auto > ============================================================================== > --- > wicket/trunk/wicket-core/src/test/java/org/apache/wicket/resource/loader/InitializerStringResourceLoaderTest.java > (added) > +++ > wicket/trunk/wicket-core/src/test/java/org/apache/wicket/resource/loader/InitializerStringResourceLoaderTest.java > Tue Nov 22 07:32:09 2011 > @@ -0,0 +1,42 @@ > +/* > + * Licensed to the Apache Software Foundation (ASF) under one or more > + * contributor license agreements. See the NOTICE file distributed with > + * this work for additional information regarding copyright ownership. > + * The ASF licenses this file to You 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. > + */ > +package org.apache.wicket.resource.loader; > + > +import java.util.Arrays; > + > +import org.apache.wicket.IInitializer; > +import org.apache.wicket.resource.StringResourceLoaderTestBase; > + > +/** > + * > + */ > +public class InitializerStringResourceLoaderTest extends > StringResourceLoaderTestBase > +{ > + > + @Override > + protected IStringResourceLoader createLoader() > + { > + return new InitializerStringResourceLoader( > + Arrays.<IInitializer> asList(new FooInitializer())); > + } > + > + @Override > + public void loaderUnknownResources() > + { > + assertNull(loader.loadStringResource((Class<?>)null, > "fhadfjksd", null, null, null)); > + } > +} > > Propchange: > wicket/trunk/wicket-core/src/test/java/org/apache/wicket/resource/loader/InitializerStringResourceLoaderTest.java > ------------------------------------------------------------------------------ > svn:mime-type = text/plain > > Added: > wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/Initializer.properties > URL: > http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/Initializer.properties?rev=1204836&view=auto > ============================================================================== > --- > wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/Initializer.properties > (added) > +++ > wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/Initializer.properties > Tue Nov 22 07:32:09 2011 > @@ -0,0 +1,18 @@ > +# Licensed to the Apache Software Foundation (ASF) under one or more > +# contributor license agreements. See the NOTICE file distributed with > +# this work for additional information regarding copyright ownership. > +# The ASF licenses this file to You 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. > +NavigatorLabel=Showing ${from} to ${to} of ${of} > +datatable.no-records-found=No Records Found > + > +UploadStatusResource.status=${percentageComplete} finished, > ${bytesUploadedString} of ${totalBytesString} at ${transferRateString}; > ${remainingTimeString} > \ No newline at end of file > > Propchange: > wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/Initializer.properties > ------------------------------------------------------------------------------ > svn:mime-type = text/plain > > Added: > wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/Initializer_de.properties > URL: > http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/Initializer_de.properties?rev=1204836&view=auto > ============================================================================== > --- > wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/Initializer_de.properties > (added) > +++ > wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/Initializer_de.properties > Tue Nov 22 07:32:09 2011 > @@ -0,0 +1,16 @@ > +# Licensed to the Apache Software Foundation (ASF) under one or more > +# contributor license agreements. See the NOTICE file distributed with > +# this work for additional information regarding copyright ownership. > +# The ASF licenses this file to You 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. > +NavigatorLabel=Zeige ${from} bis ${to} von ${of} > +datatable.no-records-found=Kein Ergebnis > > Propchange: > wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/Initializer_de.properties > ------------------------------------------------------------------------------ > svn:mime-type = text/plain > > Added: > wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/Initializer_fr.properties.xml > URL: > http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/Initializer_fr.properties.xml?rev=1204836&view=auto > ============================================================================== > --- > wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/Initializer_fr.properties.xml > (added) > +++ > wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/Initializer_fr.properties.xml > Tue Nov 22 07:32:09 2011 > @@ -0,0 +1,22 @@ > +<?xml version="1.0" encoding="UTF-8"?> > +<!-- > + Licensed to the Apache Software Foundation (ASF) under one or more > + contributor license agreements. See the NOTICE file distributed with > + this work for additional information regarding copyright ownership. > + The ASF licenses this file to You 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. > +--> > +<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd";> > +<properties> > + <entry key="NavigatorLabel">Affichage de ${from} à ${to} sur > ${of}</entry> > + <entry key="datatable.no-records-found">Aucun résultat</entry> > +</properties> > \ No newline at end of file > > Propchange: > wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/Initializer_fr.properties.xml > ------------------------------------------------------------------------------ > svn:mime-type = text/plain > > Modified: > wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadStatusResource.java > URL: > http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadStatusResource.java?rev=1204836&r1=1204835&r2=1204836&view=diff > ============================================================================== > --- > wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadStatusResource.java > (original) > +++ > wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadStatusResource.java > Tue Nov 22 07:32:09 2011 > @@ -101,11 +101,7 @@ class UploadStatusResource extends Abstr > { > status = info.getPercentageComplete() + > "|" + > - new StringResourceModel( > - RESOURCE_STATUS, > - (Component)null, > - Model.of(info), > - "${percentageComplete}% finished, > ${bytesUploadedString} of ${totalBytesString} at ${transferRateString}; > ${remainingTimeString}").getString(); > + new StringResourceModel(RESOURCE_STATUS, > (Component)null, Model.of(info)).getString(); > } > return status; > } > > > -- Martin Grigorov jWeekend Training, Consulting, Development http://jWeekend.com
