Too bad it must be done by hand, I didn't know that, thanks for the addition. We should create the files+mapping for all the languages available in XE. Is there really no way to have prop files discovered automatically ?
JV. On Thu, Dec 3, 2009 at 4:12 PM, mflorea <[email protected]> wrote: > Author: mflorea > Date: 2009-12-03 16:12:38 +0100 (Thu, 03 Dec 2009) > New Revision: 25433 > > Modified: > > platform/web/trunk/wysiwyg/src/main/java/com/xpn/xwiki/wysiwyg/server/plugin/macro/XWikiMacroService.java > > platform/web/trunk/wysiwyg/src/main/resources/com/xpn/xwiki/wysiwyg/Wysiwyg.gwt.xml > Log: > XWIKI-4612: Wiki Macro parameter display in wysiwyg do not respect the order > of parameters > Also enabled the German language. > > > Modified: > platform/web/trunk/wysiwyg/src/main/java/com/xpn/xwiki/wysiwyg/server/plugin/macro/XWikiMacroService.java > =================================================================== > --- > platform/web/trunk/wysiwyg/src/main/java/com/xpn/xwiki/wysiwyg/server/plugin/macro/XWikiMacroService.java > 2009-12-03 15:12:09 UTC (rev 25432) > +++ > platform/web/trunk/wysiwyg/src/main/java/com/xpn/xwiki/wysiwyg/server/plugin/macro/XWikiMacroService.java > 2009-12-03 15:12:38 UTC (rev 25433) > @@ -23,7 +23,7 @@ > import java.util.Arrays; > import java.util.Collections; > import java.util.Comparator; > -import java.util.HashMap; > +import java.util.LinkedHashMap; > import java.util.List; > import java.util.Map; > > @@ -95,7 +95,8 @@ > > contentDescriptor.setMandatory(descriptor.getContentDescriptor().isMandatory()); > } > > - Map<String, ParameterDescriptor> parameterDescriptorMap = new > HashMap<String, ParameterDescriptor>(); > + // We use a linked hash map to preserve the order of the macro > parameters. > + Map<String, ParameterDescriptor> parameterDescriptorMap = new > LinkedHashMap<String, ParameterDescriptor>(); > for (Map.Entry<String, > org.xwiki.rendering.macro.descriptor.ParameterDescriptor> entry : descriptor > .getParameterDescriptorMap().entrySet()) { > parameterDescriptorMap.put(entry.getKey(), > createMacroParameterDescriptor(entry.getValue())); > > Modified: > platform/web/trunk/wysiwyg/src/main/resources/com/xpn/xwiki/wysiwyg/Wysiwyg.gwt.xml > =================================================================== > --- > platform/web/trunk/wysiwyg/src/main/resources/com/xpn/xwiki/wysiwyg/Wysiwyg.gwt.xml > 2009-12-03 15:12:09 UTC (rev 25432) > +++ > platform/web/trunk/wysiwyg/src/main/resources/com/xpn/xwiki/wysiwyg/Wysiwyg.gwt.xml > 2009-12-03 15:12:38 UTC (rev 25433) > @@ -28,7 +28,7 @@ > <stylesheet src="stylesheets/Wysiwyg.css"/> > <entry-point class="com.xpn.xwiki.wysiwyg.client.Wysiwyg"/> > > - <extend-property name="locale" values="fr"/> > + <extend-property name="locale" values="fr,de"/> > > <!-- BackColorExecutable --> > <replace-with > class="com.xpn.xwiki.wysiwyg.client.plugin.color.exec.BackColorExecutable"> > > _______________________________________________ > notifications mailing list > [email protected] > http://lists.xwiki.org/mailman/listinfo/notifications > _______________________________________________ devs mailing list [email protected] http://lists.xwiki.org/mailman/listinfo/devs
