From 8f7eeb9e58e19de1e9e593b2ec7d3156ae94299a Mon Sep 17 00:00:00 2001 From: Adrian Lees Date: Mon, 29 May 2006 00:55:43 +0000 Subject: Report fetching of 1 object/stylesheet correctly in status bar svn path=/trunk/netsurf/; revision=2609 --- !NetSurf/Resources/de/Messages | 12 ++++++++---- !NetSurf/Resources/en/Messages | 12 ++++++++---- !NetSurf/Resources/fr/Messages | 12 ++++++++---- !NetSurf/Resources/nl/Messages | 12 ++++++++---- render/html.c | 17 ++++++++++++----- 5 files changed, 44 insertions(+), 21 deletions(-) diff --git a/!NetSurf/Resources/de/Messages b/!NetSurf/Resources/de/Messages index 681fa9e7c..3ae710829 100644 --- a/!NetSurf/Resources/de/Messages +++ b/!NetSurf/Resources/de/Messages @@ -424,11 +424,11 @@ Complete:Page complete (%gs) Redirecting:Redirecting... Processing:Processing document Formatting:Formatting document -FetchObjs:Loading %u objects -FetchObjs2:Loading %u objects: %s +FetchObjs:Loading %u %s +FetchObjs2:Loading %u %s: %s Done:Document done -FetchStyle:Loading %u stylesheets -FetchStyle2:Loading %u stylesheets: %s +FetchStyle:Loading %u %s +FetchStyle2:Loading %u %s: %s # Fetch warning/error messages - displayed in status bar # @@ -509,6 +509,10 @@ Yes:Ja No:Nein Replace:Replace file DontReplace:Don't replace +obj:object +objs:objects +styl:stylesheet +styls:stylesheets # Interactive help # ================ diff --git a/!NetSurf/Resources/en/Messages b/!NetSurf/Resources/en/Messages index 2aad3ee19..be851dcd8 100644 --- a/!NetSurf/Resources/en/Messages +++ b/!NetSurf/Resources/en/Messages @@ -424,11 +424,11 @@ Complete:Page complete (%gs) Redirecting:Redirecting... Processing:Processing document Formatting:Formatting document -FetchObjs:Loading %u objects -FetchObjs2:Loading %u objects: %s +FetchObjs:Loading %u %s +FetchObjs2:Loading %u %s: %s Done:Document done -FetchStyle:Loading %u stylesheets -FetchStyle2:Loading %u stylesheets: %s +FetchStyle:Loading %u %s +FetchStyle2:Loading %u %s: %s # Fetch warning/error messages - displayed in status bar # @@ -509,6 +509,10 @@ Yes:Yes No:No Replace:Replace file DontReplace:Don't replace +obj:object +objs:objects +styl:stylesheet +styls:stylesheets # Interactive help # ================ diff --git a/!NetSurf/Resources/fr/Messages b/!NetSurf/Resources/fr/Messages index d0a65596f..cc63b92f2 100644 --- a/!NetSurf/Resources/fr/Messages +++ b/!NetSurf/Resources/fr/Messages @@ -424,11 +424,11 @@ Complete:Page terminée (%gs) Redirecting:Redirection en cours... Processing:Traitement du document Formatting:Formatage du document -FetchObjs:Chargement de %u objets -FetchObjs2:Chargement de %u objets: %s +FetchObjs:Chargement de %u %s +FetchObjs2:Chargement de %u %s: %s Done:Document terminé -FetchStyle:Chargement de %u feuilles de styles -FetchStyle2:Chargement de %u feuilles de styles: %s +FetchStyle:Chargement de %u %s +FetchStyle2:Chargement de %u %s: %s # Fetch warning/error messages - displayed in status bar # @@ -509,6 +509,10 @@ Yes:Oui No:Non Replace:Replace file DontReplace:Don't replace +obj:objet +objs:objets +styl:feuille de styles +styls:feuilles de styles # Interactive help # ================ diff --git a/!NetSurf/Resources/nl/Messages b/!NetSurf/Resources/nl/Messages index 6257de50a..1a883c177 100644 --- a/!NetSurf/Resources/nl/Messages +++ b/!NetSurf/Resources/nl/Messages @@ -424,11 +424,11 @@ Complete:pagina verwerkt (%gs) Redirecting:doorverwijzen... Processing:verwerking van document Formatting:document opmaken -FetchObjs:laden van %u objecten -FetchObjs2:laden van %u objecten: %s +FetchObjs:laden van %u %s +FetchObjs2:laden van %u %s: %s Done:klaar -FetchStyle:laden van %u stylesheets -FetchStyle2:laden van %u stylesheets: %s +FetchStyle:laden van %u %s +FetchStyle2:laden van %u %s: %s # Fetch warning/error messages - displayed in status bar # @@ -509,6 +509,10 @@ Yes:Ja No:Nee Replace:Replace file DontReplace:Don't replace +obj:object +objs:objecten +styl:stylesheet +styls:stylesheets # Interactive help # ================ diff --git a/render/html.c b/render/html.c index fe36085e0..7baf4ca91 100644 --- a/render/html.c +++ b/render/html.c @@ -362,7 +362,8 @@ bool html_convert(struct content *c, int width, int height) content_set_status(c, messages_get("Done")); } else { c->status = CONTENT_STATUS_READY; - content_set_status(c, messages_get("FetchObjs"), c->active); + content_set_status(c, messages_get("FetchObjs"), c->active, + messages_get((c->active == 1) ? "obj" : "objs")); } return true; @@ -730,7 +731,8 @@ bool html_find_stylesheets(struct content *c, xmlNode *head) while (c->active != 0) { if (c->active != last_active) { content_set_status(c, messages_get("FetchStyle"), - c->active); + c->active, + messages_get((c->active == 1) ? "styl" : "styls")); content_broadcast(c, CONTENT_MSG_STATUS, msg_data); last_active = c->active; } @@ -821,7 +823,9 @@ void html_convert_css_callback(content_msg msg, struct content *css, case CONTENT_MSG_STATUS: content_set_status(c, messages_get("FetchStyle2"), - c->active, css->status_message); + c->active, + messages_get((c->active == 1) ? "styl" : "styls"), + css->status_message); content_broadcast(c, CONTENT_MSG_STATUS, data); break; @@ -1069,7 +1073,9 @@ void html_object_callback(content_msg msg, struct content *object, case CONTENT_MSG_STATUS: content_set_status(c, messages_get("FetchObjs2"), - c->active, object->status_message); + c->active, + messages_get((c->active == 1) ? "obj" : "objs"), + object->status_message); /* content_broadcast(c, CONTENT_MSG_STATUS, 0); */ break; @@ -1169,7 +1175,8 @@ void html_object_callback(content_msg msg, struct content *object, content_broadcast(c, CONTENT_MSG_DONE, data); } if (c->status == CONTENT_STATUS_READY) - content_set_status(c, messages_get("FetchObjs"), c->active); + content_set_status(c, messages_get("FetchObjs"), c->active, + messages_get((c->active == 1) ? "obj" : "objs")); } -- cgit v1.2.3