Skip to content

Commit b8cb1f0

Browse files
rogerwangrogerwang
committed
mac menu i18n
1 parent 723a199 commit b8cb1f0

File tree

2 files changed

+81
-21
lines changed

2 files changed

+81
-21
lines changed

‎src/browser/standard_menus_mac.mm

Lines changed: 26 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,11 @@
2121
#include "content/nw/src/browser/standard_menus_mac.h"
2222

2323
#include "base/strings/sys_string_conversions.h"
24+
#include "base/strings/utf_string_conversions.h"
25+
#include "grit/nw_resources.h"
26+
#include "ui/base/l10n/l10n_util.h"
27+
#include "ui/base/l10n/l10n_util_mac.h"
28+
2429
#import <Cocoa/Cocoa.h>
2530

2631
// For some reaon, Apple removed setAppleMenu from the headers in 10.4,
@@ -42,30 +47,30 @@ - (void)setAppleMenu:(NSMenu *)menu;
4247
void StandardMenusMac::BuildAppleMenu() {
4348
NSMenu* appleMenu = [[NSMenu alloc] initWithTitle:@""];
4449

45-
NSString* name = base::SysUTF8ToNSString(app_name_);
46-
[appleMenu addItemWithTitle:[@"About " stringByAppendingString:name]
50+
string16 name = base::UTF8ToUTF16(app_name_);
51+
[appleMenu addItemWithTitle:l10n_util::GetNSStringFWithFixup(IDS_ABOUT_MAC, name)
4752
action:@selector(orderFrontStandardAboutPanel:)
4853
keyEquivalent:@""];
4954

5055
[appleMenu addItem:[NSMenuItem separatorItem]];
5156

52-
[appleMenu addItemWithTitle:[@"Hide " stringByAppendingString:name]
57+
[appleMenu addItemWithTitle:l10n_util::GetNSStringFWithFixup(IDS_HIDE_APP_MAC, name)
5358
action:@selector(hide:)
5459
keyEquivalent:@"h"];
5560

5661
NSMenuItem* menuItem = (NSMenuItem *)[appleMenu
57-
addItemWithTitle:@"Hide Others"
62+
addItemWithTitle:l10n_util::GetNSStringWithFixup(IDS_HIDE_OTHERS_MAC)
5863
action:@selector(hideOtherApplications:)
5964
keyEquivalent:@"h"];
6065
[menuItem setKeyEquivalentModifierMask:(NSAlternateKeyMask|NSCommandKeyMask)];
6166

62-
[appleMenu addItemWithTitle:@"Show All"
67+
[appleMenu addItemWithTitle:l10n_util::GetNSStringWithFixup(IDS_SHOW_ALL_MAC)
6368
action:@selector(unhideAllApplications:)
6469
keyEquivalent:@""];
6570

6671
[appleMenu addItem:[NSMenuItem separatorItem]];
6772

68-
[appleMenu addItemWithTitle:[@"Quit " stringByAppendingString:name]
73+
[appleMenu addItemWithTitle:l10n_util::GetNSStringFWithFixup(IDS_EXIT_MAC, name)
6974
action:@selector(closeAllWindows:)
7075
keyEquivalent:@"q"];
7176

@@ -77,36 +82,36 @@ - (void)setAppleMenu:(NSMenu *)menu;
7782
}
7883

7984
void StandardMenusMac::BuildEditMenu() {
80-
NSMenu* editMenu = [[NSMenu alloc] initWithTitle:@"Edit"];
85+
NSMenu* editMenu = [[NSMenu alloc] initWithTitle:l10n_util::GetNSStringWithFixup(IDS_EDIT_MENU_MAC)];
8186

82-
[editMenu addItemWithTitle:@"Undo"
87+
[editMenu addItemWithTitle:l10n_util::GetNSStringWithFixup(IDS_EDIT_UNDO_MAC)
8388
action:@selector(undo:)
8489
keyEquivalent:@"z"];
8590
NSMenuItem* menuItem = (NSMenuItem *)[editMenu
86-
addItemWithTitle:@"Redo"
91+
addItemWithTitle:l10n_util::GetNSStringWithFixup(IDS_EDIT_REDO_MAC)
8792
action:@selector(redo:)
8893
keyEquivalent:@"z"];
8994
[menuItem setKeyEquivalentModifierMask:(NSShiftKeyMask|NSCommandKeyMask)];
9095

9196
[editMenu addItem:[NSMenuItem separatorItem]];
9297

93-
[editMenu addItemWithTitle:@"Cut"
98+
[editMenu addItemWithTitle:l10n_util::GetNSStringWithFixup(IDS_CUT_MAC)
9499
action:@selector(cut:)
95100
keyEquivalent:@"x"];
96-
[editMenu addItemWithTitle:@"Copy"
101+
[editMenu addItemWithTitle:l10n_util::GetNSStringWithFixup(IDS_COPY_MAC)
97102
action:@selector(copy:)
98103
keyEquivalent:@"c"];
99-
[editMenu addItemWithTitle:@"Paste"
104+
[editMenu addItemWithTitle:l10n_util::GetNSStringWithFixup(IDS_PASTE_MAC)
100105
action:@selector(paste:)
101106
keyEquivalent:@"v"];
102-
[editMenu addItemWithTitle:@"Delete"
107+
[editMenu addItemWithTitle:l10n_util::GetNSStringWithFixup(IDS_EDIT_DELETE_MAC)
103108
action:@selector(delete:)
104109
keyEquivalent:@""];
105-
[editMenu addItemWithTitle:@"Select All"
110+
[editMenu addItemWithTitle:l10n_util::GetNSStringWithFixup(IDS_EDIT_SELECT_ALL_MAC)
106111
action:@selector(selectAll:)
107112
keyEquivalent:@"a"];
108113

109-
menuItem = [[NSMenuItem alloc] initWithTitle:@"Edit"
114+
menuItem = [[NSMenuItem alloc] initWithTitle:l10n_util::GetNSStringWithFixup(IDS_EDIT_MENU_MAC)
110115
action:nil
111116
keyEquivalent:@""];
112117
[menuItem setSubmenu:editMenu];
@@ -117,23 +122,24 @@ - (void)setAppleMenu:(NSMenu *)menu;
117122
}
118123

119124
void StandardMenusMac::BuildWindowMenu() {
120-
NSMenu* windowMenu = [[NSMenu alloc] initWithTitle:@"Window"];
125+
NSMenu* windowMenu = [[NSMenu alloc] initWithTitle:l10n_util::GetNSStringWithFixup(IDS_WINDOW_MENU_MAC)];
121126

122-
[windowMenu addItemWithTitle:@"Minimize"
127+
[windowMenu addItemWithTitle:l10n_util::GetNSStringWithFixup(IDS_MINIMIZE_WINDOW_MAC)
123128
action:@selector(performMiniaturize:)
124129
keyEquivalent:@"m"];
125-
[windowMenu addItemWithTitle:@"Close"
130+
131+
[windowMenu addItemWithTitle:l10n_util::GetNSStringWithFixup(IDS_CLOSE_WINDOW_MAC)
126132
action:@selector(performClose:)
127133
keyEquivalent:@"w"];
128134

129135
[windowMenu addItem:[NSMenuItem separatorItem]];
130136

131-
[windowMenu addItemWithTitle:@"Bring All to Front"
137+
[windowMenu addItemWithTitle:l10n_util::GetNSStringWithFixup(IDS_ALL_WINDOWS_FRONT_MAC)
132138
action:@selector(arrangeInFront:)
133139
keyEquivalent:@""];
134140

135141
NSMenuItem* windowMenuItem = [[NSMenuItem alloc]
136-
initWithTitle:@"Window"
142+
initWithTitle:l10n_util::GetNSStringWithFixup(IDS_WINDOW_MENU_MAC)
137143
action:nil
138144
keyEquivalent:@""];
139145
[windowMenuItem setSubmenu:windowMenu];

‎src/resources/nw_resources.grd

Lines changed: 55 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,61 @@
8383
<message name="IDS_CUSTOM_FILES" desc="The description of the custom file extensions in the select file dialog.">
8484
Custom Files
8585
</message>
86-
86+
<if expr="is_macosx">
87+
<message name="IDS_EDIT_MENU_MAC" desc="The menu title of the Mac edit menu.">
88+
Edit
89+
</message>
90+
<message name="IDS_WINDOW_MENU_MAC" desc="The menu title of the Mac window menu.">
91+
Window
92+
</message>
93+
<message name="IDS_ABOUT_MAC" desc="The Mac menu item to open the about box.">
94+
About <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph>
95+
</message>
96+
<message name="IDS_HIDE_APP_MAC" desc="The Mac menu item to hide all browser windows in the app menu.">
97+
Hide <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph>
98+
</message>
99+
<message name="IDS_HIDE_OTHERS_MAC" desc="The Mac menu item to hide other applications' windows in the app menu.">
100+
Hide Others
101+
</message>
102+
<message name="IDS_SHOW_ALL_MAC" desc="The Mac menu item to show all browser windows in the app menu.">
103+
Show All
104+
</message>
105+
<message name="IDS_EXIT_MAC" desc="The Mac menu item to quit the browser in the app menu.">
106+
Quit <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph>
107+
</message>
108+
<message name="IDS_EDIT_UNDO_MAC" desc="The Mac menu item undo in the edit menu.">
109+
Undo
110+
</message>
111+
<message name="IDS_EDIT_REDO_MAC" desc="The Mac menu item redo in the edit menu.">
112+
Redo
113+
</message>
114+
<message name="IDS_CUT_MAC" desc="The Mac menu item for cut in the edit menu.">
115+
Cut
116+
</message>
117+
<message name="IDS_COPY_MAC" desc="The Mac menu item for copy in the edit menu.">
118+
Copy
119+
</message>
120+
<message name="IDS_PASTE_MAC" desc="The Mac menu item for paste in the edit menu.">
121+
Paste
122+
</message>
123+
<message name="IDS_EDIT_DELETE_MAC" desc="The Mac menu item delete in the edit menu.">
124+
Delete
125+
</message>
126+
<message name="IDS_EDIT_SELECT_ALL_MAC" desc="The Mac menu item select all in the edit menu.">
127+
Select All
128+
</message>
129+
<message name="IDS_MINIMIZE_WINDOW_MAC"
130+
desc="The Mac menu item for minimize the window menu."
131+
meaning="Mac Menubar: The Mac menu item for minimize the window menu.">
132+
Minimize
133+
</message>
134+
<message name="IDS_CLOSE_WINDOW_MAC" desc="The Mac menu item to close a window in the file menu.">
135+
Close Window
136+
</message>
137+
<message name="IDS_ALL_WINDOWS_FRONT_MAC" desc="The Mac menu item for bring all to front the window menu.">
138+
Bring All to Front
139+
</message>
140+
</if>
87141
</messages>
88142
</release>
89143
</grit>

0 commit comments

Comments
 (0)