Attachment #186665 for bug #331260

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Lines 10-16 Link Here

(-)Application.e4xmi (-1 / +1 lines)
10	</children>	10	</children>
11	</children>	11	</children>
12	<mainMenu xmi:id="menu:org.eclipse.ui.main.menu" elementId="menu:org.eclipse.ui.main.menu">	12	<mainMenu xmi:id="menu:org.eclipse.ui.main.menu" elementId="menu:org.eclipse.ui.main.menu">
13	<children xsi:type="menu:Menu" xmi:id="_SeXUD-8EEd6FC9cDb6iV7g" elementId="_SeXUD-8EEd6FC9cDb6iV7g" label="File">	13	<children xsi:type="menu:Menu" xmi:id="_SeXUD-8EEd6FC9cDb6iV7g" elementId="_SeXUD-8EEd6FC9cDb6iV7g" label="%fileMenu">
14	<children xsi:type="menu:HandledMenuItem" xmi:id="_SeXUEO8EEd6FC9cDb6iV7g" elementId="_SeXUEO8EEd6FC9cDb6iV7g" label="Save" iconURI="platform:/plugin/org.eclipse.e4.demo.contacts/icons/silk/disk.png" command="contacts.save"/>	14	<children xsi:type="menu:HandledMenuItem" xmi:id="_SeXUEO8EEd6FC9cDb6iV7g" elementId="_SeXUEO8EEd6FC9cDb6iV7g" label="Save" iconURI="platform:/plugin/org.eclipse.e4.demo.contacts/icons/silk/disk.png" command="contacts.save"/>
15	<children xsi:type="menu:HandledMenuItem" xmi:id="_SeXUEe8EEd6FC9cDb6iV7g" elementId="_SeXUEe8EEd6FC9cDb6iV7g" label="Delete" iconURI="platform:/plugin/org.eclipse.e4.demo.contacts/icons/silk/user_delete.png" command="contacts.delete"/>	15	<children xsi:type="menu:HandledMenuItem" xmi:id="_SeXUEe8EEd6FC9cDb6iV7g" elementId="_SeXUEe8EEd6FC9cDb6iV7g" label="Delete" iconURI="platform:/plugin/org.eclipse.e4.demo.contacts/icons/silk/user_delete.png" command="contacts.delete"/>
16	<children xsi:type="menu:DirectMenuItem" xmi:id="_SeXUEu8EEd6FC9cDb6iV7g" elementId="_SeXUEu8EEd6FC9cDb6iV7g" label="Direct Exit" contributionURI="platform:/plugin/org.eclipse.e4.demo.contacts/org.eclipse.e4.demo.contacts.handlers.ExitHandler"/>	16	<children xsi:type="menu:DirectMenuItem" xmi:id="_SeXUEu8EEd6FC9cDb6iV7g" elementId="_SeXUEu8EEd6FC9cDb6iV7g" label="Direct Exit" contributionURI="platform:/plugin/org.eclipse.e4.demo.contacts/org.eclipse.e4.demo.contacts.handlers.ExitHandler"/>

Lines 10-13 Link Here

(-)build.properties (-1 / +3 lines)
10	css/,\	10	css/,\
11	splash.bmp,\	11	splash.bmp,\
12	plugin_customization.ini,\	12	plugin_customization.ini,\
13	vcards/	13	vcards/,\
		14	plugin_ru.properties,\
		15	plugin.properties

Lines 31-35 Link Here

(-)META-INF/MANIFEST.MF (+1 lines)
31	javax.inject;version="1.0.0"	31	javax.inject;version="1.0.0"
32	Bundle-Activator: org.eclipse.e4.demo.contacts.BundleActivatorImpl	32	Bundle-Activator: org.eclipse.e4.demo.contacts.BundleActivatorImpl
33	Export-Package: org.eclipse.e4.demo.contacts.model	33	Export-Package: org.eclipse.e4.demo.contacts.model
		34	Bundle-Localization: plugin
34		35
35		36

Added Link Here

(-)plugin.properties (+11 lines)
1	###############################################################################
2	# Copyright (c) 2011 IBM Corporation and others.
3	# All rights reserved. This program and the accompanying materials
4	# are made available under the terms of the Eclipse Public License v1.0
5	# which accompanies this distribution, and is available at
6	# http://www.eclipse.org/legal/epl-v10.html
7	#
8	# Contributors:
9	# IBM Corporation - initial API and implementation
10	###############################################################################
11	fileMenu = &File

Added Link Here

(-)plugin_ru.properties (+11 lines)
1	###############################################################################
2	# Copyright (c) 2011 IBM Corporation and others.
3	# All rights reserved. This program and the accompanying materials
4	# are made available under the terms of the Eclipse Public License v1.0
5	# which accompanies this distribution, and is available at
6	# http://www.eclipse.org/legal/epl-v10.html
7	#
8	# Contributors:
9	# IBM Corporation - initial API and implementation
10	###############################################################################
11	fileMenu = &\u0424\u0430\u0439\u043B




import org.eclipse.e4.core.contexts.RunAndTrack;
import org.eclipse.e4.core.services.events.IEventBroker;
import org.eclipse.e4.core.services.log.Logger;
import org.eclipse.e4.core.services.translation.TranslationProvider;
import org.eclipse.e4.ui.internal.workbench.ContributionsAnalyzer;
import org.eclipse.e4.ui.model.application.MApplication;
import org.eclipse.e4.ui.model.application.ui.MCoreExpression;

		if (text == null || text.length() == 0) {
			return NO_LABEL;
		}
		// XXX
		IEclipseContext parentContext = modelService
				.getContainingContext(menuModel);
		TranslationProvider translation = parentContext
				.get(TranslationProvider.class);
		String translated = translation.translate(text,
				menuModel.getContributorURI());
		return translated;
		// return text;
	}

	private ImageDescriptor getImageDescriptor(MUILabel element) {

Return to bug 331260

Lines 25-30 Link Here

(-)src/org/eclipse/e4/ui/workbench/renderers/swt/MenuManagerRenderer.java (-1 / +10 lines)
25	import org.eclipse.e4.core.contexts.RunAndTrack;	25	import org.eclipse.e4.core.contexts.RunAndTrack;
26	import org.eclipse.e4.core.services.events.IEventBroker;	26	import org.eclipse.e4.core.services.events.IEventBroker;
27	import org.eclipse.e4.core.services.log.Logger;	27	import org.eclipse.e4.core.services.log.Logger;
		28	import org.eclipse.e4.core.services.translation.TranslationProvider;
28	import org.eclipse.e4.ui.internal.workbench.ContributionsAnalyzer;	29	import org.eclipse.e4.ui.internal.workbench.ContributionsAnalyzer;
29	import org.eclipse.e4.ui.model.application.MApplication;	30	import org.eclipse.e4.ui.model.application.MApplication;
30	import org.eclipse.e4.ui.model.application.ui.MCoreExpression;	31	import org.eclipse.e4.ui.model.application.ui.MCoreExpression;
Lines 754-760 Link Here
754	if (text == null \|\| text.length() == 0) {	755	if (text == null \|\| text.length() == 0) {
755	return NO_LABEL;	756	return NO_LABEL;
756	}	757	}
757	return text;	758	// XXX
		759	IEclipseContext parentContext = modelService
		760	.getContainingContext(menuModel);
		761	TranslationProvider translation = parentContext
		762	.get(TranslationProvider.class);
		763	String translated = translation.translate(text,
		764	menuModel.getContributorURI());
		765	return translated;
		766	// return text;
758	}	767	}
759		768
760	private ImageDescriptor getImageDescriptor(MUILabel element) {	769	private ImageDescriptor getImageDescriptor(MUILabel element) {