Imported Upstream version 0.5.5

[pkg/abook.git] / options.c

diff --git a/options.c b/options.c
index fbbd2a3987574d69c881f6726a1588f38ee696e6..235da40b1bbde08e80ac8cb3b1cc8d5973d48559 100644 (file)
--- a/options.c
+++ b/options.c
@@ -1,6 +1,6 @@
 
 /*
- * $Id: options.c,v 1.25 2005/08/13 10:49:25 jheinonen Exp $
+ * $Id: options.c,v 1.27 2005/09/21 16:50:31 jheinonen Exp $
  *
  * by JH <jheinonen@users.sourceforge.net>
  *
@@ -15,6 +15,7 @@
 #include <assert.h>
 #include "options.h"
 #include "abook.h"
+#include "gettext.h"
 #include "misc.h"
 #include "xmalloc.h"
 
@@ -188,10 +189,8 @@ opt_line_remove_comments(char *p)
        for(; *p; p++) {
                switch(*p) {
                        case '\"':
-                               if(!escape) {
+                               if(!escape)
                                        in_quote = !in_quote;
-                                       escape = FALSE;
-                               }
                                break;
                        case '\\':
                                escape = TRUE;
@@ -238,7 +237,7 @@ opt_set_set_option(char *var, char *p, struct option *opt)
 
        if(p[len - 1] == '\"' && *p == '\"') {
                if(len < 3)
-                       return "invalid value";
+                       return _("invalid value");
                p[len - 1] = 0;
                p++;
        }
@@ -257,7 +256,7 @@ opt_set_set_option(char *var, char *p, struct option *opt)
                                        !strcasecmp(p, "off"))
                                set_bool(opt -> data, FALSE);
                        else
-                               return "invalid value";
+                               return _("invalid value");
                        break;
                default:
                        assert(0);
@@ -276,7 +275,7 @@ opt_parse_set(buffer *b)
        if((p = strchr(b -> ptr, '=')))
                *p++ = 0;
        else
-               return "invalid value assignment";
+               return _("invalid value assignment");
 
        strtrim(b -> ptr);
 
@@ -284,7 +283,7 @@ opt_parse_set(buffer *b)
                if(!strcmp(abook_vars[i].option, b -> ptr))
                        return opt_set_set_option(b -> ptr, p, &abook_vars[i]);
 
-       return "unknown option";
+       return _("unknown option");
 }
 
 #include "database.h" /* needed for change_custom_field_name */
@@ -309,7 +308,7 @@ opt_parse_customfield(buffer *b)
        find_token_start(b);
 
        if(change_custom_field_name(b->ptr, n) == -1)
-               return "invalid custom field number";
+               return _("invalid custom field number");
 
        return NULL;
 }
@@ -356,11 +355,11 @@ opt_parse_line(char *line, int n, char *fn)
                        break;
                }
 
-       fprintf(stderr, "%s: parse error at line %d: ", fn, n);
+       fprintf(stderr, _("%s: parse error at line %d: "), fn, n);
        if(err)
                fprintf(stderr, "%s\n", err);
        else
-               fprintf(stderr, "unknown token %s\n", token);
+               fprintf(stderr, _("unknown token %s\n"), token);
 
        return TRUE;
 }