From 62b9d359f73d7df333597b010ba0a6afcea296db Mon Sep 17 00:00:00 2001 From: Stefan Ritt Date: Mon, 15 Jun 2015 16:26:54 +0200 Subject: [PATCH] Fixed draft functionality under foreign languages --- resources/eloglang.brazilian | 4 +++- resources/eloglang.bulgarian | 4 +++- resources/eloglang.czech | 4 +++- resources/eloglang.danish | 4 +++- resources/eloglang.dutch | 4 +++- resources/eloglang.french | 4 +++- resources/eloglang.german | 8 +++----- resources/eloglang.indonesia | 4 +++- resources/eloglang.italian | 4 +++- resources/eloglang.japanese | 4 +++- resources/eloglang.ru_CP1251 | 4 +++- resources/eloglang.slovak | 4 +++- resources/eloglang.spanish | 4 +++- resources/eloglang.swedish | 4 +++- resources/eloglang.turkish | 4 +++- resources/eloglang.zh_CN-GB2312 | 4 +++- resources/eloglang.zh_CN-UTF8 | 4 +++- src/elogd.c | 12 ++++++------ 18 files changed, 57 insertions(+), 27 deletions(-) diff --git a/resources/eloglang.brazilian b/resources/eloglang.brazilian index 179e7a9b..95365c70 100755 --- a/resources/eloglang.brazilian +++ b/resources/eloglang.brazilian @@ -488,6 +488,8 @@ All time = Draft = Restrict seach to last = days = -This is a draft message, edit and submit it to make it permament = Draft saved at = You might however then overwrite each other's modifications = +Draft entry created on %s by %s = +Really delete this entry? = +This is a draft message, edit and submit it to make it permanent = diff --git a/resources/eloglang.bulgarian b/resources/eloglang.bulgarian index bff70cca..9f55ba37 100755 --- a/resources/eloglang.bulgarian +++ b/resources/eloglang.bulgarian @@ -488,6 +488,8 @@ All time = Draft = Restrict seach to last = days = -This is a draft message, edit and submit it to make it permament = Draft saved at = You might however then overwrite each other's modifications = +Draft entry created on %s by %s = +Really delete this entry? = +This is a draft message, edit and submit it to make it permanent = diff --git a/resources/eloglang.czech b/resources/eloglang.czech index c0510bee..5c38f330 100644 --- a/resources/eloglang.czech +++ b/resources/eloglang.czech @@ -485,6 +485,8 @@ All time = Draft = Restrict seach to last = days = -This is a draft message, edit and submit it to make it permament = Draft saved at = You might however then overwrite each other's modifications = +Draft entry created on %s by %s = +Really delete this entry? = +This is a draft message, edit and submit it to make it permanent = diff --git a/resources/eloglang.danish b/resources/eloglang.danish index 542597a6..b1ff285c 100755 --- a/resources/eloglang.danish +++ b/resources/eloglang.danish @@ -488,6 +488,8 @@ All time = Draft = Restrict seach to last = days = -This is a draft message, edit and submit it to make it permament = Draft saved at = You might however then overwrite each other's modifications = +Draft entry created on %s by %s = +Really delete this entry? = +This is a draft message, edit and submit it to make it permanent = diff --git a/resources/eloglang.dutch b/resources/eloglang.dutch index 4494ac4b..e9ebb91f 100755 --- a/resources/eloglang.dutch +++ b/resources/eloglang.dutch @@ -487,6 +487,8 @@ All time = Draft = Restrict seach to last = days = -This is a draft message, edit and submit it to make it permament = Draft saved at = You might however then overwrite each other's modifications = +Draft entry created on %s by %s = +Really delete this entry? = +This is a draft message, edit and submit it to make it permanent = diff --git a/resources/eloglang.french b/resources/eloglang.french index 4aa51dff..cec36098 100755 --- a/resources/eloglang.french +++ b/resources/eloglang.french @@ -485,6 +485,8 @@ All time = Draft = Restrict seach to last = days = -This is a draft message, edit and submit it to make it permament = Draft saved at = You might however then overwrite each other's modifications = +Draft entry created on %s by %s = +Really delete this entry? = +This is a draft message, edit and submit it to make it permanent = diff --git a/resources/eloglang.german b/resources/eloglang.german index 34e32c05..fef3f278 100755 --- a/resources/eloglang.german +++ b/resources/eloglang.german @@ -480,11 +480,9 @@ All time = Immer Draft = Entwurf Restrict seach to last = Suche einschränken auf letzte days = Tage -This is a draft message, edit and submit it to make it permament = Dies ist ein Entwurf, bitte ändern und abschicken um ihn permanent zu machen Draft saved at = Entwurf gespeichert um You might however then overwrite each other's modifications = Sie würde dann jedoch die Änderungen von jemand anderem überschreiben +Draft entry created on %s by %s = Entwurf erstellt am %s von %s +Really delete this entry? = Diesen Eintrag wirklich löschen? +This is a draft message, edit and submit it to make it permanent = Dies ist ein Entwurf, bitte ändern und abschicken um ihn permanent zu machen - -# -#---- please translate following items and then remove this comment ----# -# diff --git a/resources/eloglang.indonesia b/resources/eloglang.indonesia index 819c55c6..7819d3e2 100644 --- a/resources/eloglang.indonesia +++ b/resources/eloglang.indonesia @@ -486,7 +486,9 @@ Entry can only be deleted %1.2lg hours after creation = Draft = Restrict seach to last = days = -This is a draft message, edit and submit it to make it permament = Insert Timestamp = Draft saved at = You might however then overwrite each other's modifications = +Draft entry created on %s by %s = +Really delete this entry? = +This is a draft message, edit and submit it to make it permanent = diff --git a/resources/eloglang.italian b/resources/eloglang.italian index 93cbe559..1cbe09a0 100755 --- a/resources/eloglang.italian +++ b/resources/eloglang.italian @@ -484,6 +484,8 @@ All time = Draft = Restrict seach to last = days = -This is a draft message, edit and submit it to make it permament = Draft saved at = You might however then overwrite each other's modifications = +Draft entry created on %s by %s = +Really delete this entry? = +This is a draft message, edit and submit it to make it permanent = diff --git a/resources/eloglang.japanese b/resources/eloglang.japanese index d630fb8f..7b5e04a7 100755 --- a/resources/eloglang.japanese +++ b/resources/eloglang.japanese @@ -484,6 +484,8 @@ All time = Draft = Restrict seach to last = days = -This is a draft message, edit and submit it to make it permament = Draft saved at = You might however then overwrite each other's modifications = +Draft entry created on %s by %s = +Really delete this entry? = +This is a draft message, edit and submit it to make it permanent = diff --git a/resources/eloglang.ru_CP1251 b/resources/eloglang.ru_CP1251 index 90056559..efc9740d 100644 --- a/resources/eloglang.ru_CP1251 +++ b/resources/eloglang.ru_CP1251 @@ -489,6 +489,8 @@ All time = Draft = Restrict seach to last = days = -This is a draft message, edit and submit it to make it permament = Draft saved at = You might however then overwrite each other's modifications = +Draft entry created on %s by %s = +Really delete this entry? = +This is a draft message, edit and submit it to make it permanent = diff --git a/resources/eloglang.slovak b/resources/eloglang.slovak index b5dee225..4e7e1444 100644 --- a/resources/eloglang.slovak +++ b/resources/eloglang.slovak @@ -463,6 +463,8 @@ All time = Draft = Restrict seach to last = days = -This is a draft message, edit and submit it to make it permament = Draft saved at = You might however then overwrite each other's modifications = +Draft entry created on %s by %s = +Really delete this entry? = +This is a draft message, edit and submit it to make it permanent = diff --git a/resources/eloglang.spanish b/resources/eloglang.spanish index 5593004a..08673830 100755 --- a/resources/eloglang.spanish +++ b/resources/eloglang.spanish @@ -487,6 +487,8 @@ All time = Draft = Restrict seach to last = days = -This is a draft message, edit and submit it to make it permament = Draft saved at = You might however then overwrite each other's modifications = +Draft entry created on %s by %s = +Really delete this entry? = +This is a draft message, edit and submit it to make it permanent = diff --git a/resources/eloglang.swedish b/resources/eloglang.swedish index 9f9a2767..410767f9 100644 --- a/resources/eloglang.swedish +++ b/resources/eloglang.swedish @@ -487,6 +487,8 @@ All time = Draft = Restrict seach to last = days = -This is a draft message, edit and submit it to make it permament = Draft saved at = You might however then overwrite each other's modifications = +Draft entry created on %s by %s = +Really delete this entry? = +This is a draft message, edit and submit it to make it permanent = diff --git a/resources/eloglang.turkish b/resources/eloglang.turkish index 871d011e..bc2f1f4c 100755 --- a/resources/eloglang.turkish +++ b/resources/eloglang.turkish @@ -487,6 +487,8 @@ All time = Draft = Restrict seach to last = days = -This is a draft message, edit and submit it to make it permament = Draft saved at = You might however then overwrite each other's modifications = +Draft entry created on %s by %s = +Really delete this entry? = +This is a draft message, edit and submit it to make it permanent = diff --git a/resources/eloglang.zh_CN-GB2312 b/resources/eloglang.zh_CN-GB2312 index 8a562ae1..8247351b 100644 --- a/resources/eloglang.zh_CN-GB2312 +++ b/resources/eloglang.zh_CN-GB2312 @@ -486,6 +486,8 @@ All time = Draft = Restrict seach to last = days = -This is a draft message, edit and submit it to make it permament = Draft saved at = You might however then overwrite each other's modifications = +Draft entry created on %s by %s = +Really delete this entry? = +This is a draft message, edit and submit it to make it permanent = diff --git a/resources/eloglang.zh_CN-UTF8 b/resources/eloglang.zh_CN-UTF8 index bab966b3..83ff33c8 100644 --- a/resources/eloglang.zh_CN-UTF8 +++ b/resources/eloglang.zh_CN-UTF8 @@ -486,6 +486,8 @@ All time = Draft = Restrict seach to last = days = -This is a draft message, edit and submit it to make it permament = Draft saved at = You might however then overwrite each other's modifications = +Draft entry created on %s by %s = +Really delete this entry? = +This is a draft message, edit and submit it to make it permanent = diff --git a/src/elogd.c b/src/elogd.c index 69677c33..42fb8ab2 100755 --- a/src/elogd.c +++ b/src/elogd.c @@ -9513,8 +9513,8 @@ int check_drafts(LOGBOOK * lbs) sprintf(str, loc("Draft entry created on %s by %s"), datetime, draft); rsprintf("%s\n", str); rsprintf(""); - rsprintf("", - loc("Edit"), draft_id[i]); + rsprintf("", + loc("Edit"), draft_id[i], loc("Edit")); rsprintf("\n"); } @@ -24611,9 +24611,9 @@ void show_elog_entry(LOGBOOK * lbs, char *dec_path, char *command) } else { if (draft[0]) { rsprintf("%s\n", - loc("This is a draft message, edit and submit it to make it permament")); - rsprintf(" ", - loc("Edit"), message_id); + loc("This is a draft message, edit and submit it to make it permanent")); + rsprintf(" ", + loc("Edit"), message_id, loc("Edit")); rsprintf("\n"); } } @@ -27822,7 +27822,7 @@ void interprete(char *lbook, char *path) return; } - if (strieq(command, loc("Save")) && !isparam("cfgpage") && !isparam("new_user_name")) { + if ((strieq(command, loc("Save")) || strieq(command, "Save")) && !isparam("cfgpage") && !isparam("new_user_name")) { /* save draft message */ if (isparam("unm")) strlcpy(str, getparam("unm"), sizeof(str));