[geany/geany-plugins] 9d7d03: Fix translatability of several plugins

Colomban Wendling git-noreply at xxxxx
Mon Feb 29 01:07:52 UTC 2016


Branch:      refs/heads/master
Author:      Colomban Wendling <ban at herbesfolles.org>
Committer:   Colomban Wendling <ban at herbesfolles.org>
Date:        Mon, 29 Feb 2016 01:07:52 UTC
Commit:      9d7d03ef21c80b25d53431e812edadda1c0b97ad
             https://github.com/geany/geany-plugins/commit/9d7d03ef21c80b25d53431e812edadda1c0b97ad

Log Message:
-----------
Fix translatability of several plugins


Modified Paths:
--------------
    devhelp/src/dhp-plugin.c
    geanyctags/src/geanyctags.c
    geanydoc/src/geanydoc.c
    geanyextrasel/src/extrasel.c
    geanyinsertnum/src/insertnum.c
    geanymacro/src/geanymacro.c
    geanyprj/src/geanyprj.c
    overview/overview/overviewplugin.c
    shiftcolumn/src/shiftcolumn.c

Modified: devhelp/src/dhp-plugin.c
4 lines changed, 3 insertions(+), 1 deletions(-)
===================================================================
@@ -38,7 +38,9 @@
 
 PLUGIN_VERSION_CHECK(200)
 
-PLUGIN_SET_INFO(
+PLUGIN_SET_TRANSLATABLE_INFO(
+	LOCALEDIR,
+	GETTEXT_PACKAGE,
 	_("Devhelp Plugin"),
 	_("Adds support for looking up documentation in Devhelp, manual pages, and "
 	  "Google Code Search in the integrated viewer."),


Modified: geanyctags/src/geanyctags.c
3 lines changed, 2 insertions(+), 1 deletions(-)
===================================================================
@@ -47,7 +47,8 @@
 
 
 PLUGIN_VERSION_CHECK(211)
-PLUGIN_SET_INFO("GeanyCtags",
+PLUGIN_SET_TRANSLATABLE_INFO(LOCALEDIR, GETTEXT_PACKAGE,
+	"GeanyCtags",
 	_("Ctags generation and search plugin for geany projects"),
 	VERSION,
 	"Jiri Techet <techet at gmail.com>")


Modified: geanydoc/src/geanydoc.c
6 lines changed, 3 insertions(+), 3 deletions(-)
===================================================================
@@ -47,8 +47,9 @@ static GtkWidget *keyb2;
  * for binary compatibility. */
 PLUGIN_VERSION_CHECK(128)
 /* All plugins must set name, description, version and author. */
-	PLUGIN_SET_INFO(_("Doc"), _("Call documentation viewer on current symbol."), VERSION,
-		"Yura Siamshka <yurand2 at gmail.com>")
+PLUGIN_SET_TRANSLATABLE_INFO(LOCALEDIR, GETTEXT_PACKAGE,
+	_("Doc"), _("Call documentation viewer on current symbol."), VERSION,
+	"Yura Siamshka <yurand2 at gmail.com>")
 
 /* Keybinding(s) */
      enum
@@ -436,7 +437,6 @@ plugin_init(G_GNUC_UNUSED GeanyData * data)
 	gchar *kb_label1;
 	gchar *kb_label2;
 
-	main_locale_init(LOCALEDIR, GETTEXT_PACKAGE);
 	kb_label1 = _("Document current word");
 	kb_label2 = _("Document interactive");
 


Modified: geanyextrasel/src/extrasel.c
4 lines changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -31,7 +31,8 @@ GeanyFunctions	*geany_functions;
 
 PLUGIN_VERSION_CHECK(189)
 
-PLUGIN_SET_INFO(_("Extra Selection"), _("Column mode, select to line / brace / anchor."),
+PLUGIN_SET_TRANSLATABLE_INFO(LOCALEDIR, GETTEXT_PACKAGE,
+	_("Extra Selection"), _("Column mode, select to line / brace / anchor."),
 	"0.52", "Dimitar Toshkov Zhekov <dimitar.zhekov at gmail.com>")
 
 /* Keybinding(s) */
@@ -496,7 +497,6 @@ void plugin_init(G_GNUC_UNUSED GeanyData *data)
 	GtkWidget *item;
 	GeanyKeyGroup *plugin_key_group;
 
-	main_locale_init(LOCALEDIR, GETTEXT_PACKAGE);
 	plugin_key_group = plugin_set_key_group(geany_plugin, "extra_select", COUNT_KB, NULL);
 
 	item = gtk_menu_item_new_with_mnemonic(_("E_xtra Selection"));


Modified: geanyinsertnum/src/insertnum.c
4 lines changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -41,7 +41,8 @@ GeanyFunctions	*geany_functions;
 
 PLUGIN_VERSION_CHECK(189)
 
-PLUGIN_SET_INFO(_("Insert Numbers"), _("Insert/Fill columns with numbers."),
+PLUGIN_SET_TRANSLATABLE_INFO(LOCALEDIR, GETTEXT_PACKAGE,
+	_("Insert Numbers"), _("Insert/Fill columns with numbers."),
 	"0.2.2", "Dimitar Toshkov Zhekov <dimitar.zhekov at gmail.com>")
 
 /* Keybinding(s) */
@@ -468,7 +469,6 @@ void plugin_init(G_GNUC_UNUSED GeanyData *data)
 {
 	GeanyKeyGroup *plugin_key_group;
 
-	main_locale_init(LOCALEDIR, GETTEXT_PACKAGE);
 	plugin_key_group = plugin_set_key_group(geany_plugin, "insert_numbers", COUNT_KB, NULL);
 
 	start_value = 1;


Modified: geanymacro/src/geanymacro.c
5 lines changed, 3 insertions(+), 2 deletions(-)
===================================================================
@@ -178,8 +178,9 @@ GeanyFunctions  *geany_functions;
 
 PLUGIN_VERSION_CHECK(147)
 
-PLUGIN_SET_INFO(_("Macros"),_("Macros for Geany"),
-                "1.1","William Fraser <william.fraser at virgin.net>")
+PLUGIN_SET_TRANSLATABLE_INFO(LOCALEDIR, GETTEXT_PACKAGE,
+                             _("Macros"),_("Macros for Geany"),
+                             "1.1","William Fraser <william.fraser at virgin.net>")
 
 /* Plugin user alterable settings */
 static gboolean bSaveMacros=TRUE;


Modified: geanyprj/src/geanyprj.c
6 lines changed, 3 insertions(+), 3 deletions(-)
===================================================================
@@ -35,8 +35,9 @@
 #include "geanyprj.h"
 
 PLUGIN_VERSION_CHECK(221)
-PLUGIN_SET_INFO("GeanyPrj", _("Alternative project support."), VERSION,
-		"Yura Siamashka <yurand2 at gmail.com>")
+PLUGIN_SET_TRANSLATABLE_INFO(LOCALEDIR, GETTEXT_PACKAGE,
+			     "GeanyPrj", _("Alternative project support."), VERSION,
+			     "Yura Siamashka <yurand2 at gmail.com>")
 
 GeanyData      *geany_data;
 GeanyFunctions *geany_functions;
@@ -210,7 +211,6 @@ static void on_configure_response(G_GNUC_UNUSED GtkDialog *dialog, G_GNUC_UNUSED
 /* Called by Geany to initialize the plugin */
 void plugin_init(G_GNUC_UNUSED GeanyData *data)
 {
-	main_locale_init(LOCALEDIR, GETTEXT_PACKAGE);
 	load_settings();
 	tools_menu_init();
 


Modified: overview/overview/overviewplugin.c
4 lines changed, 3 insertions(+), 1 deletions(-)
===================================================================
@@ -44,7 +44,9 @@ PLUGIN_VERSION_CHECK (224)
 PLUGIN_VERSION_CHECK (211)
 #endif
 
-PLUGIN_SET_INFO (
+PLUGIN_SET_TRANSLATABLE_INFO (
+  LOCALEDIR,
+  GETTEXT_PACKAGE,
   "Overview",
   _("Provides an overview of the active document"),
   "0.01",


Modified: shiftcolumn/src/shiftcolumn.c
10 lines changed, 4 insertions(+), 6 deletions(-)
===================================================================
@@ -46,9 +46,10 @@ GeanyData       *geany_data;
 GeanyFunctions  *geany_functions;
 
 PLUGIN_VERSION_CHECK(130)
-PLUGIN_SET_INFO(_("Shift Column"),
-                _("Shift a selection left and right"),
-                VERSION, "Andrew L Janke <a.janke at gmail.com>")
+PLUGIN_SET_TRANSLATABLE_INFO(LOCALEDIR, GETTEXT_PACKAGE,
+                             _("Shift Column"),
+                             _("Shift a selection left and right"),
+                             VERSION, "Andrew L Janke <a.janke at gmail.com>")
 
 
 static GtkWidget *menu_item_shift_left = NULL;
@@ -374,9 +375,6 @@ static void kb_shift_right(G_GNUC_UNUSED guint key_id){
 
 void plugin_init(G_GNUC_UNUSED GeanyData *data){
 
-   /* init gettext and friends */
-   main_locale_init(LOCALEDIR, GETTEXT_PACKAGE);
-
    menu_item_shift_left = gtk_menu_item_new_with_mnemonic(_("Shift Left"));
    gtk_widget_show(menu_item_shift_left);
    gtk_container_add(GTK_CONTAINER(geany->main_widgets->tools_menu),



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).


More information about the Plugins-Commits mailing list