diff options
-rw-r--r-- | !NetSurf/Resources/de/Messages | 11 | ||||
-rw-r--r-- | !NetSurf/Resources/en/Messages | 11 | ||||
-rw-r--r-- | !NetSurf/Resources/fr/Messages | 11 | ||||
-rw-r--r-- | !NetSurf/Resources/it/Messages | 11 | ||||
-rw-r--r-- | !NetSurf/Resources/nl/Messages | 9 | ||||
-rw-r--r-- | content/content.c | 31 | ||||
-rw-r--r-- | render/html.c | 8 |
7 files changed, 38 insertions, 54 deletions
diff --git a/!NetSurf/Resources/de/Messages b/!NetSurf/Resources/de/Messages index c0d0677c2..f8cf8f2e7 100644 --- a/!NetSurf/Resources/de/Messages +++ b/!NetSurf/Resources/de/Messages @@ -761,15 +761,14 @@ OverwriteFile:Eine Datei mit diesem Namen existiert bereits und würde überschr # Progress:%s von %s ProgressU:%s -Loading:Seite öffnen... RecPercent:Empfangen %s (%u%%) Received:Empfangen %s -Converting:Konvertiere %lu Bytes -Complete:Seite komplett (%gs) Redirecting:Umleiten... -Processing:Dokument auswerten -Formatting:Dokument formatieren -Done:Dokument fertiggestellt +Loading:Loading +Fetching:Fetching data +Processing:Auswerten +Formatting:Formatieren +Done:Fertiggestellt Stopped:Stopped # Fetch warning/error messages - displayed in status bar diff --git a/!NetSurf/Resources/en/Messages b/!NetSurf/Resources/en/Messages index ce093767c..dfc0fac5f 100644 --- a/!NetSurf/Resources/en/Messages +++ b/!NetSurf/Resources/en/Messages @@ -781,15 +781,14 @@ OverwriteFile:A file with that name already exists and would be lost. # Progress:%s of %s ProgressU:%s -Loading:Opening page... RecPercent:Received %s (%u%%) Received:Received %s -Converting:Converting %lu bytes -Complete:Page complete (%gs) Redirecting:Redirecting... -Processing:Processing document -Formatting:Formatting document -Done:Document done +Loading:Loading +Fetching:Fetching data +Processing:Processing +Formatting:Formatting +Done:Done Stopped:Stopped # Fetch warning/error messages - displayed in status bar diff --git a/!NetSurf/Resources/fr/Messages b/!NetSurf/Resources/fr/Messages index 3bbaa8cf8..ceeb25fb6 100644 --- a/!NetSurf/Resources/fr/Messages +++ b/!NetSurf/Resources/fr/Messages @@ -761,15 +761,14 @@ OverwriteFile:Un fichier portant ce nom existe déjà et serait perdu. # Progress:%s reçus de %s ProgressU:%s -Loading:Ouverture de la page... RecPercent:%s (%u%%) Received:%s reçus -Converting:Conversion de %lu octets -Complete:Page terminée (%gs) Redirecting:Redirection en cours... -Processing:Traitement du document -Formatting:Formatage du document -Done:Document terminé +Loading:Loading +Fetching:Fetching data +Processing:Traitement +Formatting:Formatage +Done:Terminé Stopped:Stopped # Fetch warning/error messages - displayed in status bar diff --git a/!NetSurf/Resources/it/Messages b/!NetSurf/Resources/it/Messages index 7682f5ee5..badfa5eac 100644 --- a/!NetSurf/Resources/it/Messages +++ b/!NetSurf/Resources/it/Messages @@ -766,15 +766,14 @@ OverwriteFile:Un file con questo nome è già esistente, continuare comporterà # Progress:%s di %s ProgressU:%s -Loading:Apertura della pagina in corso... RecPercent:Ricevuti %s (%u%%) Received:Ricevuti %s -Converting:Conversione di %lu byte -Complete:Pagina completata (%gs) Redirecting:Redirezione in corso... -Processing:Elaborazione del documento in corso... -Formatting:Formattazione del documento in corso... -Done:Documento completato +Loading:Loading +Fetching:Fetching data +Processing:Elaborazione +Formatting:Formattazione +Done:Completato Stopped:Interrotto # Fetch warning/error messages - displayed in status bar diff --git a/!NetSurf/Resources/nl/Messages b/!NetSurf/Resources/nl/Messages index e73822077..3e652a5ae 100644 --- a/!NetSurf/Resources/nl/Messages +++ b/!NetSurf/Resources/nl/Messages @@ -762,14 +762,13 @@ OverwriteFile:Een bestand met deze naam bestaat al en zal verloren gaan. # Progress:%s van %s ProgressU:%s -Loading:pagina ophalen... RecPercent:ontvangen %s (%u%%) Received:ontvangen %s -Converting:converteren van %lu bytes -Complete:pagina verwerkt (%gs) Redirecting:doorverwijzen... -Processing:verwerking van document -Formatting:document opmaken +Loading:Loading +Fetching:Fetching data +Processing:verwerking +Formatting:opmaken Done:klaar Stopped:Stopped diff --git a/content/content.c b/content/content.c index dd5c01ae7..0a47cfd65 100644 --- a/content/content.c +++ b/content/content.c @@ -169,7 +169,7 @@ nserror content_llcache_callback(llcache_handle *llcache, source = llcache_handle_get_source_data(llcache, &source_size); - content_set_status(c, messages_get("Converting"), source_size); + content_set_status(c, messages_get("Processing"), source_size); content_broadcast(c, CONTENT_MSG_STATUS, msg_data); content_convert(c); @@ -233,24 +233,19 @@ void content_set_status(struct content *c, const char *status_message, ...) void content_update_status(struct content *c) { - char token[20]; - const char *status; - unsigned int time; - - snprintf(token, sizeof token, "HTTP%li", c->http_code); - status = messages_get(token); - if (status == token) - status = token + 4; - if (c->status == CONTENT_STATUS_LOADING || - c->status == CONTENT_STATUS_READY) - time = wallclock() - c->time; - else - time = c->time; - - snprintf(c->status_message, sizeof (c->status_message), - "%s (%.1fs) %s", status, - (float) time / 100, c->sub_status); + c->status == CONTENT_STATUS_READY) { + /* Not done yet */ + snprintf(c->status_message, sizeof (c->status_message), + "%s%s%s", messages_get("Fetching"), + c->sub_status ? ", " : " ", c->sub_status); + } else { + unsigned int time = c->time; + snprintf(c->status_message, sizeof (c->status_message), + "%s (%.1fs) %s", messages_get("Done"), + (float) time / 100, c->sub_status); + } + /* LOG(("%s", c->status_message)); */ } diff --git a/render/html.c b/render/html.c index aa905802e..20ff41f5e 100644 --- a/render/html.c +++ b/render/html.c @@ -1918,13 +1918,7 @@ void html_set_status(html_content *c, const char *extra) stylesheets = c->stylesheet_count; objects = c->num_objects - c->base.active; } - content_set_status(&c->base, "%u/%u %s %u/%u %s %s", - stylesheets, c->stylesheet_count, - messages_get((c->stylesheet_count == 1) ? - "styl" : "styls"), - objects, c->num_objects, - messages_get((c->num_objects == 1) ? "obj" : "objs"), - extra); + content_set_status(&c->base, "%s", extra); } |