Changed locale implementation.

1 files changed, 127 insertions, 127 deletions

diff --git a/modules/textadept/menu.lua b/modules/textadept/menu.lua
index f014d8c2..658b72b4 100644
--- a/modules/textadept/menu.lua
+++ b/modules/textadept/menu.lua
@@ -1,6 +1,6 @@
 -- Copyright 2007-2010 Mitchell mitchell<att>caladbolg.net. See LICENSE.
 
-local locale = _G.locale
+local L = _G.locale.localize
 local events = _G.events
 
 ---
@@ -132,157 +132,157 @@ local ID = {
 
 local menubar = {
   gtkmenu {
-    title = l.MENU_FILE_TITLE,
-    { l.MENU_FILE_NEW, ID.NEW },
-    { l.MENU_FILE_OPEN, ID.OPEN },
-    { l.MENU_FILE_RELOAD, ID.RELOAD },
-    { l.MENU_FILE_SAVE, ID.SAVE },
-    { l.MENU_FILE_SAVEAS, ID.SAVEAS },
+    title = L('_File'),
+    { L('gtk-new'), ID.NEW },
+    { L('gtk-open'), ID.OPEN },
+    { L('_Reload'), ID.RELOAD },
+    { L('gtk-save'), ID.SAVE },
+    { L('gtk-save-as'), ID.SAVEAS },
     { SEPARATOR, ID.SEPARATOR },
-    { l.MENU_FILE_CLOSE, ID.CLOSE },
-    { l.MENU_FILE_CLOSE_ALL, ID.CLOSE_ALL },
+    { L('gtk-close'), ID.CLOSE },
+    { L('Close A_ll'), ID.CLOSE_ALL },
     { SEPARATOR, ID.SEPARATOR },
-    { l.MENU_FILE_LOAD_SESSION, ID.LOAD_SESSION },
-    { l.MENU_FILE_SAVE_SESSION, ID.SAVE_SESSION },
+    { L('Loa_d Session...'), ID.LOAD_SESSION },
+    { L('Sa_ve Session...'), ID.SAVE_SESSION },
     { SEPARATOR, ID.SEPARATOR },
-    { l.MENU_FILE_QUIT, ID.QUIT },
+    { L('gtk-quit'), ID.QUIT },
   },
   gtkmenu {
-    title = l.MENU_EDIT_TITLE,
-    { l.MENU_EDIT_UNDO, ID.UNDO },
-    { l.MENU_EDIT_REDO, ID.REDO },
+    title = L('_Edit'),
+    { L('gtk-undo'), ID.UNDO },
+    { L('gtk-redo'), ID.REDO },
     { SEPARATOR, ID.SEPARATOR },
-    { l.MENU_EDIT_CUT, ID.CUT },
-    { l.MENU_EDIT_COPY, ID.COPY },
-    { l.MENU_EDIT_PASTE, ID.PASTE },
-    { l.MENU_EDIT_DELETE, ID.DELETE },
-    { l.MENU_EDIT_SELECT_ALL, ID.SELECT_ALL },
+    { L('gtk-cut'), ID.CUT },
+    { L('gtk-copy'), ID.COPY },
+    { L('gtk-paste'), ID.PASTE },
+    { L('gtk-delete'), ID.DELETE },
+    { L('gtk-select-all'), ID.SELECT_ALL },
     { SEPARATOR, ID.SEPARATOR },
-    { l.MENU_EDIT_MATCH_BRACE, ID.MATCH_BRACE },
-    { l.MENU_EDIT_SELECT_TO_BRACE, ID.SELECT_TO_BRACE },
-    { l.MENU_EDIT_COMPLETE_WORD, ID.COMPLETE_WORD },
-    { l.MENU_EDIT_DELETE_WORD, ID.DELETE_WORD },
-    { l.MENU_EDIT_TRANSPOSE_CHARACTERS, ID.TRANSPOSE_CHARACTERS },
-    { l.MENU_EDIT_JOIN_LINES, ID.JOIN_LINES },
-    { l.MENU_EDIT_CONVERT_INDENTATION, ID.CONVERT_INDENTATION },
-    { title = l.MENU_EDIT_SEL_TITLE,
-      { title = l.MENU_EDIT_SEL_ENC_TITLE,
-        { l.MENU_EDIT_SEL_ENC_HTML_TAGS, ID.ENCLOSE_IN_HTML_TAGS },
-        { l.MENU_EDIT_SEL_ENC_HTML_SINGLE_TAG, ID.ENCLOSE_IN_HTML_SINGLE_TAG },
-        { l.MENU_EDIT_SEL_ENC_DOUBLE_QUOTES, ID.ENCLOSE_IN_DOUBLE_QUOTES },
-        { l.MENU_EDIT_SEL_ENC_SINGLE_QUOTES, ID.ENCLOSE_IN_SINGLE_QUOTES },
-        { l.MENU_EDIT_SEL_ENC_PARENTHESES, ID.ENCLOSE_IN_PARENTHESES },
-        { l.MENU_EDIT_SEL_ENC_BRACKETS, ID.ENCLOSE_IN_BRACKETS },
-        { l.MENU_EDIT_SEL_ENC_BRACES, ID.ENCLOSE_IN_BRACES },
-        { l.MENU_EDIT_SEL_ENC_CHAR_SEQ, ID.ENCLOSE_IN_CHARACTER_SEQUENCE },
+    { L('Match _Brace'), ID.MATCH_BRACE },
+    { L('Select t_o Brace'), ID.SELECT_TO_BRACE },
+    { L('Complete _Word'), ID.COMPLETE_WORD },
+    { L('De_lete Word'), ID.DELETE_WORD },
+    { L('Tran_spose Characters'), ID.TRANSPOSE_CHARACTERS },
+    { L('_Join Lines'), ID.JOIN_LINES },
+    { L('Convert _Indentation'), ID.CONVERT_INDENTATION },
+    { title = L('S_election'),
+      { title = L('_Enclose in...'),
+        { L('_HTML Tags'), ID.ENCLOSE_IN_HTML_TAGS },
+        { L('HTML Single _Tag'), ID.ENCLOSE_IN_HTML_SINGLE_TAG },
+        { L('_Double Quotes'), ID.ENCLOSE_IN_DOUBLE_QUOTES },
+        { L('_Single Quotes'), ID.ENCLOSE_IN_SINGLE_QUOTES },
+        { L('_Parentheses'), ID.ENCLOSE_IN_PARENTHESES },
+        { L('_Brackets'), ID.ENCLOSE_IN_BRACKETS },
+        { L('B_races'), ID.ENCLOSE_IN_BRACES },
+        { L('_Character Sequence'), ID.ENCLOSE_IN_CHARACTER_SEQUENCE },
       },
-      { l.MENU_EDIT_SEL_GROW, ID.GROW_SELECTION },
+      { L('_Grow'), ID.GROW_SELECTION },
     },
-    { title = l.MENU_EDIT_SEL_IN_TITLE,
-      { l.MENU_EDIT_SEL_IN_HTML_TAG, ID.SELECT_IN_HTML_TAG },
-      { l.MENU_EDIT_SEL_IN_DOUBLE_QUOTE, ID.SELECT_IN_DOUBLE_QUOTE },
-      { l.MENU_EDIT_SEL_IN_SINGLE_QUOTE, ID.SELECT_IN_SINGLE_QUOTE },
-      { l.MENU_EDIT_SEL_IN_PARENTHESIS, ID.SELECT_IN_PARENTHESIS },
-      { l.MENU_EDIT_SEL_IN_BRACKET, ID.SELECT_IN_BRACKET },
-      { l.MENU_EDIT_SEL_IN_BRACE, ID.SELECT_IN_BRACE },
-      { l.MENU_EDIT_SEL_IN_WORD, ID.SELECT_IN_WORD },
-      { l.MENU_EDIT_SEL_IN_LINE, ID.SELECT_IN_LINE },
-      { l.MENU_EDIT_SEL_IN_PARAGRAPH, ID.SELECT_IN_PARAGRAPH },
-      { l.MENU_EDIT_SEL_IN_INDENTED_BLOCK, ID.SELECT_IN_INDENTED_BLOCK },
-      { l.MENU_EDIT_SEL_IN_SCOPE, ID.SELECT_IN_SCOPE },
+    { title = L('Select i_n...'),
+      { L('_HTML Tag'), ID.SELECT_IN_HTML_TAG },
+      { L('_Double Quote'), ID.SELECT_IN_DOUBLE_QUOTE },
+      { L('_Single Quote'), ID.SELECT_IN_SINGLE_QUOTE },
+      { L('_Parenthesis'), ID.SELECT_IN_PARENTHESIS },
+      { L('_Bracket'), ID.SELECT_IN_BRACKET },
+      { L('B_race'), ID.SELECT_IN_BRACE },
+      { L('_Word'), ID.SELECT_IN_WORD },
+      { L('_Line'), ID.SELECT_IN_LINE },
+      { L('Para_graph'), ID.SELECT_IN_PARAGRAPH },
+      { L('_Indented Block'), ID.SELECT_IN_INDENTED_BLOCK },
+      { L('S_cope'), ID.SELECT_IN_SCOPE },
     },
   },
   gtkmenu {
-    title = l.MENU_TOOLS_TITLE,
-    { title = l.MENU_TOOLS_SEARCH_TITLE,
-      { l.MENU_TOOLS_SEARCH_FIND, ID.FIND },
-      { l.MENU_TOOLS_SEARCH_FIND_NEXT, ID.FIND_NEXT },
-      { l.MENU_TOOLS_SEARCH_FIND_PREV, ID.FIND_PREV },
-      { l.MENU_TOOLS_SEARCH_FIND_AND_REPLACE, ID.FIND_AND_REPLACE },
-      { l.MENU_TOOLS_SEARCH_REPLACE, ID.REPLACE },
-      { l.MENU_TOOLS_SEARCH_REPLACE_ALL, ID.REPLACE_ALL },
-      { l.MENU_TOOLS_SEARCH_FIND_INCREMENTAL, ID.FIND_INCREMENTAL },
+    title = L('_Tools'),
+    { title = L('_Find'),
+      { L('gtk-find'), ID.FIND },
+      { L('Find _Next'), ID.FIND_NEXT },
+      { L('Find _Previous'), ID.FIND_PREV },
+      { L('gtk-find-and-replace'), ID.FIND_AND_REPLACE },
+      { L('Replace'), ID.REPLACE },
+      { L('Replace _All'), ID.REPLACE_ALL },
+      { L('Find _Incremental'), ID.FIND_INCREMENTAL },
       { SEPARATOR, ID.SEPARATOR },
-      { l.MENU_TOOLS_SEARCH_FIND_IN_FILES, ID.FIND_IN_FILES },
-      { l.MENU_TOOLS_SEARCH_GOTO_NEXT_FILE_FOUND, ID.GOTO_NEXT_FILE_FOUND },
-      { l.MENU_TOOLS_SEARCH_GOTO_PREV_FILE_FOUND, ID.GOTO_PREV_FILE_FOUND },
+      { L('Find in Fi_les'), ID.FIND_IN_FILES },
+      { L('Goto Next File Found'), ID.GOTO_NEXT_FILE_FOUND },
+      { L('Goto Previous File Found'), ID.GOTO_PREV_FILE_FOUND },
       { SEPARATOR, ID.SEPARATOR },
-      { l.MENU_TOOLS_SEARCH_GOTO_LINE, ID.GOTO_LINE },
+      { L('gtk-jump-to'), ID.GOTO_LINE },
     },
-    { l.MENU_TOOLS_FOCUS_COMMAND_ENTRY, ID.FOCUS_COMMAND_ENTRY },
+    { L('Command _Entry'), ID.FOCUS_COMMAND_ENTRY },
     { SEPARATOR, ID.SEPARATOR },
-    { l.MENU_TOOLS_RUN, ID.RUN },
-    { l.MENU_TOOLS_COMPILE, ID.COMPILE },
+    { L('_Run'), ID.RUN },
+    { L('_Compile'), ID.COMPILE },
     { SEPARATOR, ID.SEPARATOR },
-    { title = l.MENU_TOOLS_SNIPPETS_TITLE,
-      { l.MENU_TOOLS_SNIPPETS_INSERT, ID.INSERT_SNIPPET },
-      { l.MENU_TOOLS_SNIPPETS_PREV_PLACE, ID.PREVIOUS_SNIPPET_PLACEHOLDER },
-      { l.MENU_TOOLS_SNIPPETS_CANCEL, ID.CANCEL_SNIPPET },
-      { l.MENU_TOOLS_SNIPPETS_LIST, ID.LIST_SNIPPETS },
-      { l.MENU_TOOLS_SNIPPETS_SHOW_SCOPE, ID.SHOW_SCOPE },
+    { title = L('_Snippets'),
+      { L('_Insert'), ID.INSERT_SNIPPET },
+      { L('_Previous Placeholder'), ID.PREVIOUS_SNIPPET_PLACEHOLDER },
+      { L('_Cancel'), ID.CANCEL_SNIPPET },
+      { L('_List'), ID.LIST_SNIPPETS },
+      { L('_Show Scope'), ID.SHOW_SCOPE },
     },
-    { title = l.MENU_TOOLS_BM_TITLE,
-      { l.MENU_TOOLS_BM_TOGGLE, ID.TOGGLE_BOOKMARK },
-      { l.MENU_TOOLS_BM_CLEAR_ALL, ID.CLEAR_BOOKMARKS },
-      { l.MENU_TOOLS_BM_NEXT, ID.GOTO_NEXT_BOOKMARK },
-      { l.MENU_TOOLS_BM_PREV, ID.GOTO_PREV_BOOKMARK },
+    { title = L('_Bookmark'),
+      { L('_Toggle on Current Line'), ID.TOGGLE_BOOKMARK },
+      { L('_Clear All'), ID.CLEAR_BOOKMARKS },
+      { L('_Next'), ID.GOTO_NEXT_BOOKMARK },
+      { L('_Previous'), ID.GOTO_PREV_BOOKMARK },
     },
-    { title = l.MENU_TOOLS_SNAPOPEN_TITLE,
-      { l.MENU_TOOLS_SNAPOPEN_USERHOME, ID.SNAPOPEN_USERHOME },
-      { l.MENU_TOOLS_SNAPOPEN_HOME, ID.SNAPOPEN_HOME },
-      { l.MENU_TOOLS_SNAPOPEN_CURRENTDIR, ID.SNAPOPEN_CURRENTDIR },
+    { title = L('Snap_open'),
+      { L('_User Home'), ID.SNAPOPEN_USERHOME },
+      { L('_Textadept Home'), ID.SNAPOPEN_HOME },
+      { L('_Current Directory'), ID.SNAPOPEN_CURRENTDIR },
     },
   },
   gtkmenu {
-    title = l.MENU_BUF_TITLE,
-    { l.MENU_BUF_NEXT, ID.NEXT_BUFFER },
-    { l.MENU_BUF_PREV, ID.PREV_BUFFER },
-    { l.MENU_BUF_SWITCH, ID.SWITCH_BUFFER },
+    title = L('_Buffer'),
+    { L('_Next Buffer'), ID.NEXT_BUFFER },
+    { L('_Previous Buffer'), ID.PREV_BUFFER },
+    { L('Swit_ch Buffer'), ID.SWITCH_BUFFER },
     { SEPARATOR, ID.SEPARATOR },
-    { l.MENU_BUF_TOGGLE_VIEW_EOL, ID.TOGGLE_VIEW_EOL },
-    { l.MENU_BUF_TOGGLE_WRAP, ID.TOGGLE_WRAP_MODE },
-    { l.MENU_BUF_TOGGLE_INDENT_GUIDES, ID.TOGGLE_SHOW_INDENT_GUIDES },
-    { l.MENU_BUF_TOGGLE_TABS, ID.TOGGLE_USE_TABS },
-    { l.MENU_BUF_TOGGLE_VIEW_WHITESPACE, ID.TOGGLE_VIEW_WHITESPACE },
+    { L('Toggle View _EOL'), ID.TOGGLE_VIEW_EOL },
+    { L('Toggle _Wrap Mode'), ID.TOGGLE_WRAP_MODE },
+    { L('Toggle Show _Indentation Guides'), ID.TOGGLE_SHOW_INDENT_GUIDES },
+    { L('Toggle Use _Tabs'), ID.TOGGLE_USE_TABS },
+    { L('Toggle View White_space'), ID.TOGGLE_VIEW_WHITESPACE },
     { SEPARATOR, ID.SEPARATOR },
-    { title = l.MENU_BUF_EOL_MODE_TITLE,
-      { l.MENU_BUF_EOL_MODE_CRLF, ID.EOL_MODE_CRLF },
-      { l.MENU_BUF_EOL_MODE_CR, ID.EOL_MODE_CR },
-      { l.MENU_BUF_EOL_MODE_LF, ID.EOL_MODE_LF },
+    { title = L('EOL Mode'),
+      { L('CRLF'), ID.EOL_MODE_CRLF },
+      { L('CR'), ID.EOL_MODE_CR },
+      { L('LF'), ID.EOL_MODE_LF },
     },
-    { title = l.MENU_BUF_ENCODING_TITLE,
-      { l.MENU_BUF_ENCODING_UTF8, ID.ENCODING_UTF8 },
-      { l.MENU_BUF_ENCODING_ASCII, ID.ENCODING_ASCII },
-      { l.MENU_BUF_ENCODING_ISO88591, ID.ENCODING_ISO88591 },
-      { l.MENU_BUF_ENCODING_MACROMAN, ID.ENCODING_MACROMAN },
-      { l.MENU_BUF_ENCODING_UTF16, ID.ENCODING_UTF16 },
+    { title = L('Encoding'),
+      { L('UTF-8'), ID.ENCODING_UTF8 },
+      { L('ASCII'), ID.ENCODING_ASCII },
+      { L('ISO-8859-1'), ID.ENCODING_ISO88591 },
+      { L('MacRoman'), ID.ENCODING_MACROMAN },
+      { L('UTF-16'), ID.ENCODING_UTF16 },
     },
     { SEPARATOR, ID.SEPARATOR },
-    { l.MENU_BUF_REFRESH, ID.REFRESH_SYNTAX_HIGHLIGHTING },
+    { L('_Refresh Syntax Highlighting'), ID.REFRESH_SYNTAX_HIGHLIGHTING },
   },
   gtkmenu {
-    title = l.MENU_VIEW_TITLE,
-    { l.MENU_VIEW_NEXT, ID.NEXT_VIEW },
-    { l.MENU_VIEW_PREV, ID.PREV_VIEW },
+    title = L('_View'),
+    { L('_Next View'), ID.NEXT_VIEW },
+    { L('_Previous View'), ID.PREV_VIEW },
     { SEPARATOR, ID.SEPARATOR },
-    { l.MENU_VIEW_SPLIT_VERTICAL, ID.SPLIT_VIEW_VERTICAL },
-    { l.MENU_VIEW_SPLIT_HORIZONTAL, ID.SPLIT_VIEW_HORIZONTAL },
-    { l.MENU_VIEW_UNSPLIT, ID.UNSPLIT_VIEW },
-    { l.MENU_VIEW_UNSPLIT_ALL, ID.UNSPLIT_ALL_VIEWS },
+    { L('Split _Vertical'), ID.SPLIT_VIEW_VERTICAL },
+    { L('Split _Horizontal'), ID.SPLIT_VIEW_HORIZONTAL },
+    { L('_Unsplit'), ID.UNSPLIT_VIEW },
+    { L('Unsplit _All'), ID.UNSPLIT_ALL_VIEWS },
     { SEPARATOR, ID.SEPARATOR },
-    { l.MENU_VIEW_GROW, ID.GROW_VIEW },
-    { l.MENU_VIEW_SHRINK, ID.SHRINK_VIEW },
+    { L('_Grow'), ID.GROW_VIEW },
+    { L('_Shrink'), ID.SHRINK_VIEW },
   },
   -- Lexer menu inserted here
   gtkmenu {
-    title = l.MENU_HELP_TITLE,
-    { l.MENU_HELP_MANUAL, ID.MANUAL },
-    { l.MENU_HELP_LUADOC, ID.LUADOC },
+    title = L('_Help'),
+    { L('_Manual'), ID.MANUAL },
+    { L('_LuaDoc'), ID.LUADOC },
     { SEPARATOR, ID.SEPARATOR },
-    { l.MENU_HELP_ABOUT, ID.ABOUT },
+    { L('gtk-about'), ID.ABOUT },
   },
 }
-local lexer_menu = { title = l.MENU_LEX_TITLE }
+local lexer_menu = { title = L('Le_xers') }
 for _, lexer in ipairs(_m.textadept.mime_types.lexers) do
   lexer = lexer:gsub('_', '__') -- no accelerators
   lexer_menu[#lexer_menu + 1] = { lexer, ID.LEXER_START + #lexer_menu }
@@ -325,10 +325,10 @@ local function open_webpage(url)
   if WIN32 then
     cmd = string.format('start "" "%s"', url)
     local p = io.popen(cmd)
-    if not p then error(l.MENU_BROWSER_ERROR..url) end
+    if not p then error(L('Error loading webpage:')..url) end
   else
     cmd = string.format(MAC and 'open "file://%s"' or 'xdg-open "%s" &', url)
-    if os.execute(cmd) ~= 0 then error(l.MENU_BROWSER_ERROR..url) end
+    if os.execute(cmd) ~= 0 then error(L('Error loading webpage:')..url) end
   end
 end
 
@@ -345,7 +345,7 @@ local actions = {
     function()
       local session_file = _SESSIONFILE or ''
       local utf8_filename = gui.dialog('fileselect',
-                                       '--title', l.MENU_LOAD_SESSION_TITLE,
+                                       '--title', L('Load Session'),
                                        '--with-directory',
                                        session_file:match('.+[/\\]') or '',
                                        '--with-file',
@@ -360,7 +360,7 @@ local actions = {
     function()
       local session_file = _SESSIONFILE or ''
       local utf8_filename = gui.dialog('filesave',
-                                       '--title', l.MENU_SAVE_SESSION_TITLE,
+                                       '--title', L('Save Session'),
                                        '--with-directory',
                                        session_file:match('.+[/\\]') or '',
                                        '--with-file',
@@ -515,20 +515,20 @@ events.connect('menu_clicked',
         local ret, retval = pcall(f, unpack(args))
         if not ret then error(retval) end
       else
-        error(l.MENU_UNKNOWN_COMMAND..tostring(func))
+        error(L('Unknown command:')..' '..tostring(func))
       end
     end
   end)
 
 -- Right-click context menu.
 gui.context_menu = gtkmenu {
-  { l.MENU_EDIT_UNDO, ID.UNDO },
-  { l.MENU_EDIT_REDO, ID.REDO },
+  { L('gtk-undo'), ID.UNDO },
+  { L('gtk-redo'), ID.REDO },
   { SEPARATOR, ID.SEPARATOR },
-  { l.MENU_EDIT_CUT, ID.CUT },
-  { l.MENU_EDIT_COPY, ID.COPY },
-  { l.MENU_EDIT_PASTE, ID.PASTE },
-  { l.MENU_EDIT_DELETE, ID.DELETE },
+  { L('gtk-cut'), ID.CUT },
+  { L('gtk-copy'), ID.COPY },
+  { L('gtk-paste'), ID.PASTE },
+  { L('gtk-delete'), ID.DELETE },
   { SEPARATOR, ID.SEPARATOR },
-  { l.MENU_EDIT_SELECT_ALL, ID.SELECT_ALL }
+  { L('gtk-select-all'), ID.SELECT_ALL }
 }