summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Drake <tlsa@netsurf-browser.org>2013-11-11 14:32:07 +0000
committerMichael Drake <tlsa@netsurf-browser.org>2013-11-11 14:32:07 +0000
commitb547e1205b58a40e6e546189ea7948a82b4de027 (patch)
treeaa5df0d76b870e865d73f3227652b571e37651d2
parent7a920ace39937b7bc665ec7e3b716e6353467b00 (diff)
downloadnetsurf-b547e1205b58a40e6e546189ea7948a82b4de027.tar.gz
netsurf-b547e1205b58a40e6e546189ea7948a82b4de027.tar.bz2
Use messages for translations instead of string literals.
-rw-r--r--desktop/global_history.c3
-rw-r--r--desktop/hotlist.c7
-rw-r--r--resources/FatMessages18
3 files changed, 23 insertions, 5 deletions
diff --git a/desktop/global_history.c b/desktop/global_history.c
index 94521e7c3..e8d99efc2 100644
--- a/desktop/global_history.c
+++ b/desktop/global_history.c
@@ -249,7 +249,8 @@ static nserror global_history_create_treeview_field_data(
struct global_history_entry *e,
const struct url_data *data)
{
- const char *title = (data->title != NULL) ? data->title : "<No title>";
+ const char *title = (data->title != NULL) ?
+ data->title : messages_get("NoTitle");
char buffer[16];
const char *last_visited;
char *last_visited2;
diff --git a/desktop/hotlist.c b/desktop/hotlist.c
index 838b41b5e..ee3469b27 100644
--- a/desktop/hotlist.c
+++ b/desktop/hotlist.c
@@ -331,8 +331,7 @@ static nserror hotlist_add_folder_internal(
nserror err;
if (title == NULL) {
- /* TODO: use messages */
- title = "New folder";
+ title = messages_get("NewFolder");
}
/* Create the title field */
@@ -348,7 +347,7 @@ static nserror hotlist_add_folder_internal(
}
f->data.value_len = strlen(title);
- if (hl_ctx.built)
+ if (!hl_ctx.built)
flags |= TREE_OPTION_SUPPRESS_RESIZE |
TREE_OPTION_SUPPRESS_REDRAW;
if (default_folder)
@@ -556,7 +555,7 @@ static nserror hotlist_load_entry(dom_node *li, hotlist_load_ctx *ctx)
if (title1 != NULL) {
title = dom_string_data(title1);
} else {
- title = "<No title>";
+ title = messages_get("NoTitle");
}
/* Need to get URL as a nsurl object */
diff --git a/resources/FatMessages b/resources/FatMessages
index 9fe6f9013..117a6df19 100644
--- a/resources/FatMessages
+++ b/resources/FatMessages
@@ -1294,6 +1294,24 @@ it.all.HotlistDefaultFolderName:Voci non ordinate
nl.all.HotlistDefaultFolderName:Unsorted entries
+# Default name for new folders
+#
+en.all.NewFolder:New folder
+de.all.NewFolder:New folder
+fr.all.NewFolder:New folder
+it.all.NewFolder:New folder
+nl.all.NewFolder:New folder
+
+
+# Default title
+#
+en.all.NoTitle:<No title>
+de.all.NoTitle:<No title>
+fr.all.NoTitle:<No title>
+it.all.NoTitle:<No title>
+nl.all.NoTitle:<No title>
+
+
# Tree export
#