There is no need for Geany prefix on plugins. You can view, comment on, or merge this pull request online at:
https://github.com/geany/geany-plugins/pull/472
-- Commit Summary --
* Rename plugin and fix build system * Update plugins's name in README and code * Make ChangeLog as not used anymore * Add migration of configuration files * Change keybinding domain
-- File Changes --
M Makefile.am (8) D build/geanylipsum.m4 (9) A build/lipsum.m4 (9) D geanylipsum/src/Makefile.am (10) R lipsum/AUTHORS (0) R lipsum/COPYING (0) R lipsum/ChangeLog (5) R lipsum/INSTALL (0) R lipsum/Makefile.am (2) R lipsum/NEWS (0) R lipsum/README (13) A lipsum/src/Makefile.am (10) R lipsum/src/lipsum.c (71) M po/POTFILES.in (6)
-- Patch Links --
https://github.com/geany/geany-plugins/pull/472.patch https://github.com/geany/geany-plugins/pull/472.diff
--- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/geany/geany-plugins/pull/472
config_file = g_strconcat(geany->app->configdir, G_DIR_SEPARATOR_S, "plugins", G_DIR_SEPARATOR_S, "geanylipsum", G_DIR_SEPARATOR_S, "lipsum.conf", NULL);
- #ifndef G_OS_WIN32
- /* We try only to move if we are on not Windows platform */
- config_dir_old = g_strconcat(geany->app->configdir, G_DIR_SEPARATOR_S,
could use [`g_build_filename()`](https://developer.gnome.org/glib/stable/glib-Miscellaneous-Utility-Functions...) instead for these.
--- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/geany/geany-plugins/pull/472/files/e565d8a37a039ad145bbaf...
@@ -0,0 +1,10 @@ +include $(top_srcdir)/build/vars.build.mk +plugin = ylipsum
typo
--- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/geany/geany-plugins/pull/472/files/e565d8a37a039ad145bbaf...
@@ -1,12 +1,12 @@ -GeanyLipsum
+Lipsum
could change the underline length too (not necessary though)
--- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/geany/geany-plugins/pull/472/files/a129fc448e74739c1b5fd7...
_("Creating dummy text with Geany"),
- "0.4.4",
- VERSION,
so you follow GP versioning now?
--- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/geany/geany-plugins/pull/472/files/a129fc448e74739c1b5fd7...
config_file = g_strconcat(geany->app->configdir, G_DIR_SEPARATOR_S, "plugins", G_DIR_SEPARATOR_S, "geanylipsum", G_DIR_SEPARATOR_S, "lipsum.conf", NULL);
- #ifndef G_OS_WIN32
- /* We try only to move if we are on not Windows platform */
- config_dir_old = g_strconcat(geany->app->configdir, G_DIR_SEPARATOR_S,
yep, would probably be neater
--- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/geany/geany-plugins/pull/472/files/e565d8a37a039ad145bbaf...
- config_dir_old = g_strconcat(geany->app->configdir, G_DIR_SEPARATOR_S,
"plugins", G_DIR_SEPARATOR_S, "geanylipsum", NULL);
- config_file_old = g_strconcat(config_dir_old, G_DIR_SEPARATOR_S,
"lipsum.conf", NULL);
- config_dir = g_strconcat(geany->app->configdir, G_DIR_SEPARATOR_S,
"plugins", G_DIR_SEPARATOR_S, "lipsum", NULL);
- if (g_file_test(config_file_old, G_FILE_TEST_EXISTS))
- {
if (dialogs_show_question(
_("Renamed plugin detected!\n"
"\n"
"GeanyLipsum has been renamed to Lipsum -- you surely have "
"already recognised it. \n"
"Geany is able to migrate your old plugin configuration by "
"moving the old configuration file to new location.\n"
"Attention: this will not include your keybindings.\n"
should probably read "Warning:", shouldn't it?
--- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/geany/geany-plugins/pull/472/files/a129fc448e74739c1b5fd7...
config_dir_old, config_dir);
}
else
{
/* If there was an error on migrating we need
* to load from original one.
* When saving new configuration it will go to
* new folder so migration should
* be implicit. */
g_free(config_file);
config_file = g_strdup(config_file_old);
dialogs_show_msgbox(
GTK_MESSAGE_WARNING,
_("Your old configuration directory \"%s\" could "
"not be moved to \"%s\" (%s). "
"Please move manually the directory to the new location."),
*please manually move […]* or *please move the directory to the new location manually* I think. @elextr ?
--- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/geany/geany-plugins/pull/472/files/a129fc448e74739c1b5fd7...
Otherwise LGBI
--- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/geany/geany-plugins/pull/472#issuecomment-238106575
config_file = g_strconcat(geany->app->configdir, G_DIR_SEPARATOR_S, "plugins", G_DIR_SEPARATOR_S, "geanylipsum", G_DIR_SEPARATOR_S, "lipsum.conf", NULL);
- #ifndef G_OS_WIN32
- /* We try only to move if we are on not Windows platform */
- config_dir_old = g_strconcat(geany->app->configdir, G_DIR_SEPARATOR_S,
"plugins", G_DIR_SEPARATOR_S, "geanylipsum", NULL);
- config_file_old = g_strconcat(config_dir_old, G_DIR_SEPARATOR_S,
"lipsum.conf", NULL);
- config_dir = g_strconcat(geany->app->configdir, G_DIR_SEPARATOR_S,
"plugins", G_DIR_SEPARATOR_S, "lipsum", NULL);
- if (g_file_test(config_file_old, G_FILE_TEST_EXISTS))
- {
if (dialogs_show_question(
_("Renamed plugin detected!\n"
"\n"
"GeanyLipsum has been renamed to Lipsum -- you surely have "
as you will have already recognised
--- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/geany/geany-plugins/pull/472/files/a129fc448e74739c1b5fd7...
- {
if (dialogs_show_question(
_("Renamed plugin detected!\n"
"\n"
"GeanyLipsum has been renamed to Lipsum -- you surely have "
"already recognised it. \n"
"Geany is able to migrate your old plugin configuration by "
"moving the old configuration file to new location.\n"
"Attention: this will not include your keybindings.\n"
"Move now?")))
{
if (g_rename(config_dir_old, config_dir) == 0)
{
dialogs_show_msgbox(GTK_MESSAGE_INFO,
_("Your configuration directory has been "
"successfully moved from \"%s\" to \"%s\"."),
For translatable strings the %s must be order independent in case translation changes the order, use `n$` to specify the parameter: `Your configuration directory has been successfully moved from "%1$s" to "%2$s".`
--- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/geany/geany-plugins/pull/472/files/a129fc448e74739c1b5fd7...
- {
if (dialogs_show_question(
_("Renamed plugin detected!\n"
"\n"
"GeanyLipsum has been renamed to Lipsum -- you surely have "
"already recognised it. \n"
"Geany is able to migrate your old plugin configuration by "
"moving the old configuration file to new location.\n"
"Attention: this will not include your keybindings.\n"
"Move now?")))
{
if (g_rename(config_dir_old, config_dir) == 0)
{
dialogs_show_msgbox(GTK_MESSAGE_INFO,
_("Your configuration directory has been "
"successfully moved from \"%s\" to \"%s\"."),
That's not true, you don't have to use positional format to allow translators to do it. We'd have a lot more to handle if it was the case.
No, the *translators* might have to do that if they want to swap the arguments, but the developer doesn't have to worry about it so long as (s)he uses proper placeholders and not string building.
--- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/geany/geany-plugins/pull/472/files/a129fc448e74739c1b5fd7...
- {
if (dialogs_show_question(
_("Renamed plugin detected!\n"
"\n"
"GeanyLipsum has been renamed to Lipsum -- you surely have "
"already recognised it. \n"
"Geany is able to migrate your old plugin configuration by "
"moving the old configuration file to new location.\n"
"Attention: this will not include your keybindings.\n"
"Move now?")))
{
if (g_rename(config_dir_old, config_dir) == 0)
{
dialogs_show_msgbox(GTK_MESSAGE_INFO,
_("Your configuration directory has been "
"successfully moved from \"%s\" to \"%s\"."),
Do translators know about `%n$`?
--- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/geany/geany-plugins/pull/472/files/a129fc448e74739c1b5fd7...
- {
if (dialogs_show_question(
_("Renamed plugin detected!\n"
"\n"
"GeanyLipsum has been renamed to Lipsum -- you surely have "
"already recognised it. \n"
"Geany is able to migrate your old plugin configuration by "
"moving the old configuration file to new location.\n"
"Attention: this will not include your keybindings.\n"
"Move now?")))
{
if (g_rename(config_dir_old, config_dir) == 0)
{
dialogs_show_msgbox(GTK_MESSAGE_INFO,
_("Your configuration directory has been "
"successfully moved from \"%s\" to \"%s\"."),
They are supposed to and Gettext documents it.
--- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/geany/geany-plugins/pull/472/files/a129fc448e74739c1b5fd7...
_("Creating dummy text with Geany"),
- "0.4.4",
- VERSION,
Yes. Doesn't make sense to have own numbering schema here
--- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/geany/geany-plugins/pull/472/files/a129fc448e74739c1b5fd7...
@@ -0,0 +1,9 @@ +AC_DEFUN([GP_CHECK_GEANYLIPSUM],
you could want to rename that (and in the configure.ac too).
--- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/geany/geany-plugins/pull/472/files/7f33eb6f5962ad92cbc1e9...
config_file = g_strconcat(geany->app->configdir, G_DIR_SEPARATOR_S, "plugins", G_DIR_SEPARATOR_S, "geanylipsum", G_DIR_SEPARATOR_S, "lipsum.conf", NULL);
- #ifndef G_OS_WIN32
- /* We try only to move if we are on not Windows platform */
- config_dir_old = g_build_filename(geany->app->configdir,
"plugins", "geanylipsum", NULL);
- config_file_old = g_build_filename(config_dir_old,
"lipsum.conf", NULL);
- config_dir = g_build_filename(geany->app->configdir,
"plugins", "lipsum", NULL);
- if (g_file_test(config_file_old, G_FILE_TEST_EXISTS))
- {
if (dialogs_show_question(
_("Renamed plugin detected!\n"
"\n"
"GeanyLipsum has been renamed to Lipsum -- as you will "
"already recognised it. \n"
*as you will **have** already recognised.* Add *have* and remove *it*. https://github.com/geany/geany-plugins/pull/472#discussion_r73810656
(though I'd rather say *"as you will already have realized"*, but whatever @elextr says is likely correct)
--- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/geany/geany-plugins/pull/472/files/7f33eb6f5962ad92cbc1e9...
Otherwise LGBI
--- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/geany/geany-plugins/pull/472#issuecomment-238980466
config_file = g_strconcat(geany->app->configdir, G_DIR_SEPARATOR_S, "plugins", G_DIR_SEPARATOR_S, "geanylipsum", G_DIR_SEPARATOR_S, "lipsum.conf", NULL);
- #ifndef G_OS_WIN32
- /* We try only to move if we are on not Windows platform */
- config_dir_old = g_build_filename(geany->app->configdir,
"plugins", "geanylipsum", NULL);
- config_file_old = g_build_filename(config_dir_old,
"lipsum.conf", NULL);
- config_dir = g_build_filename(geany->app->configdir,
"plugins", "lipsum", NULL);
- if (g_file_test(config_file_old, G_FILE_TEST_EXISTS))
- {
if (dialogs_show_question(
_("Renamed plugin detected!\n"
"\n"
"GeanyLipsum has been renamed to Lipsum -- as you will "
"already recognised it. \n"
"As you may have already noticed, GeanyLipsum has been renamed to just Lipsum."
--- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/geany/geany-plugins/pull/472/files/7f33eb6f5962ad92cbc1e9...
config_file = g_strconcat(geany->app->configdir, G_DIR_SEPARATOR_S, "plugins", G_DIR_SEPARATOR_S, "geanylipsum", G_DIR_SEPARATOR_S, "lipsum.conf", NULL);
- #ifndef G_OS_WIN32
- /* We try only to move if we are on not Windows platform */
- config_dir_old = g_build_filename(geany->app->configdir,
"plugins", "geanylipsum", NULL);
- config_file_old = g_build_filename(config_dir_old,
"lipsum.conf", NULL);
- config_dir = g_build_filename(geany->app->configdir,
"plugins", "lipsum", NULL);
- if (g_file_test(config_file_old, G_FILE_TEST_EXISTS))
- {
if (dialogs_show_question(
_("Renamed plugin detected!\n"
"\n"
"GeanyLipsum has been renamed to Lipsum -- as you will "
"already recognised it. \n"
Could add another sentence to expand a bit like "As a result, the configuration old plugin configuration file will no longer be read".
--- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/geany/geany-plugins/pull/472/files/7f33eb6f5962ad92cbc1e9...
config_file = g_strconcat(geany->app->configdir, G_DIR_SEPARATOR_S, "plugins", G_DIR_SEPARATOR_S, "geanylipsum", G_DIR_SEPARATOR_S, "lipsum.conf", NULL);
- #ifndef G_OS_WIN32
- /* We try only to move if we are on not Windows platform */
- config_dir_old = g_build_filename(geany->app->configdir,
"plugins", "geanylipsum", NULL);
- config_file_old = g_build_filename(config_dir_old,
"lipsum.conf", NULL);
- config_dir = g_build_filename(geany->app->configdir,
"plugins", "lipsum", NULL);
- if (g_file_test(config_file_old, G_FILE_TEST_EXISTS))
- {
if (dialogs_show_question(
_("Renamed plugin detected!\n"
"\n"
"GeanyLipsum has been renamed to Lipsum -- as you will "
"already recognised it. \n"
"As you may have already noticed, GeanyLipsum has been renamed to just Lipsum."
even better
Not sure the additional sentence is needed as suggesting to move the configuration seems clear enough to me, but why not.
--- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/geany/geany-plugins/pull/472/files/7f33eb6f5962ad92cbc1e9...
Merged #472.
--- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/geany/geany-plugins/pull/472#event-751891637
github-comments@lists.geany.org