[no subject]



        * src/dialogs/dialog-function-wizard.c (formula_guru_init_args): Use
        locale dependent argument separator.

        * src/func.h (function_get_category,
        function_get_category_with_translation): Renamed args.

        * src/func.c
        (function_category_compare): Don't use g_strcasecmp, it's broken.
        (function_get_category): Use function_get_category_with_translation.
        (function_get_category_with_translation): Some code moved from
        function_get_category, keep categories sorted by display_name, store
        internal_name in "normalized" form (converted to lowercase).

Thanks to your question, I noticed that my patch was incomplete.
The missing part is in the attachment.
Jody, ok to commit?


Zbigniew

--82I3+IH0IqGh5yIs
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="gnumeric-func-guru-i18n.diff"

diff -rup --exclude=intl --exclude=po /home/cyba/gcvs/gnumeric/ChangeLog gnumeric-test/ChangeLog
--- /home/cyba/gcvs/gnumeric/ChangeLog  Sun Aug 12 08:48:58 2001
+++ gnumeric-test/ChangeLog     Sun Aug 12 22:53:08 2001
@@ -1,1 +1,11 @@
+2001-08-12  Zbigniew Chyla  <cyba gnome pl>
+
+       * src/func.h (struct TokenizedHelp): Added help_is_localized field. 
+
+       * src/func.c (tokenized_help_new): Initialize it here.
+
+       * src/dialogs/dialog-function-wizard.c (formula_guru_init_args):
+       Use the default argument separator (comma) if the function's help is
+       not localized.
+
 2001-08-12  Jody Goldberg <jgoldberg home com>
diff -rup --exclude=intl --exclude=po /home/cyba/gcvs/gnumeric/src/func.h gnumeric-test/src/func.h
--- /home/cyba/gcvs/gnumeric/src/func.h Wed Jul 18 16:15:48 2001
+++ gnumeric-test/src/func.h    Sun Aug 12 22:46:55 2001
@@ -133,6 +133,7 @@ Value *function_iterate_do_value    (const 
 /* Detailed function help */
 typedef struct {
        GPtrArray *sections;
+       gboolean   help_is_localized;
        gchar     *help_copy;
        FunctionDefinition const *fndef;
 } TokenizedHelp;
diff -rup --exclude=intl --exclude=po /home/cyba/gcvs/gnumeric/src/func.c gnumeric-test/src/func.c
--- /home/cyba/gcvs/gnumeric/src/func.c Wed Jul 18 16:15:48 2001
+++ gnumeric-test/src/func.c    Sun Aug 12 22:46:55 2001
@@ -1028,7 +1028,9 @@ tokenized_help_new (FunctionDefinition c
                int seek_att = 1;
                int last_newline = 1;
 
-               tok->help_copy = g_strdup (_(fn_def->help [0]));
+               ptr = _(fn_def->help [0]);
+               tok->help_is_localized = ptr != fn_def->help [0];
+               tok->help_copy = g_strdup (ptr);
                tok->sections = g_ptr_array_new ();
                ptr = tok->help_copy;
 
diff -rup --exclude=intl --exclude=po /home/cyba/gcvs/gnumeric/src/dialogs/dialog-function-wizard.c 
gnumeric-test/src/dialogs/dialog-function-wizard.c
--- /home/cyba/gcvs/gnumeric/src/dialogs/dialog-function-wizard.c       Wed Jul 18 16:15:48 2001
+++ gnumeric-test/src/dialogs/dialog-function-wizard.c  Sun Aug 12 22:46:55 2001
@@ -506,7 +506,9 @@ formula_guru_init_args (FormulaGuruState
        }
        ptr = copy_args = g_strdup (syntax);
        i   = 0;
-       arg_separator = format_get_arg_sep ();
+       arg_separator = state->help_tokens->help_is_localized
+                       ? format_get_arg_sep ()
+                       : ',';
        while (*ptr) {
                if (*ptr == '(' && !start)
                        start = ptr + 1;

--82I3+IH0IqGh5yIs--




[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]