Lang: New strings for directory/archive browsing

2 files changed, 16 insertions, 12 deletions

diff --git a/src/gmrequest.c b/src/gmrequest.c
index cdf4e582..1a7c37df 100644
--- a/src/gmrequest.c
+++ b/src/gmrequest.c
@@ -696,25 +696,28 @@ void submit_GmRequest(iGmRequest *d) {
                         }
                         else {
                             /* The root directory. */
-                            appendFormat_String(page, "=> %s " close_Icon " Exit the archive\n",
+                            appendFormat_String(page, "=> %s " close_Icon " ${archive.exit}\n",
                                                 cstr_String(containerUrl));
-                            appendFormat_String(page, "# %s\n\n"
-                                                "This archive contains %zu items and its compressed "
-                                                "size is %.1f MB.\n\n",
-                                                cstr_Rangecc(containerName),
+                            appendFormat_String(page, "# %s\n\n", cstr_Rangecc(containerName));
+                            appendFormat_String(page,
+                                                cstrCount_Lang("archive.summary.n", numEntries_Archive(arch)),
                                                 numEntries_Archive(arch),
                                                 (double) sourceSize_Archive(arch) / 1.0e6);
+                            appendCStr_String(page, "\n\n");
                         }
                         iStringSet *contents = iClob(listDirectory_Archive(arch, entryPath));
                         if (!isRoot) {
                             if (isEmpty_StringSet(contents)) {
-                                appendCStr_String(page, "This directory is empty.\n");
+                                appendCStr_String(page, "${dir.empty}\n");
                             }
                             else if (size_StringSet(contents) > 1) {
-                                appendFormat_String(page, "This directory contains %zu items.\n\n",
+                                appendFormat_String(page, cstrCount_Lang("dir.summary.n",
+                                                                         size_StringSet(contents)),
                                                     size_StringSet(contents));
+                                appendCStr_String(page, "\n\n");
                             }
                         }
+                        translate_Lang(page);
                         iConstForEach(StringSet, e, contents) {
                             const iString *subPath = e.value;
                             iRangecc relSub = range_String(subPath);
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 8d519865..ed38ad0b 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -1182,10 +1182,11 @@ static void updateDocument_DocumentWidget_(iDocumentWidget *d, const iGmResponse
                     setRange_String(&d->sourceMime, param);
                     iString *key = collectNew_String();
                     toString_Sym(SDLK_s, KMOD_PRIMARY, key);
-                    format_String(&str, "# %s\n"
-                                  "%s is a compressed archive.\n\n",
-                                  zipPageHeading_(param),
-                                  cstr_Rangecc(baseName_Path(d->mod.url)));
+                    format_String(&str, "# %s\n", zipPageHeading_(param));
+                    appendFormat_String(&str,
+                                        cstr_Lang("doc.archive"),
+                                        cstr_Rangecc(baseName_Path(d->mod.url)));
+                    appendCStr_String(&str, "\n\n");
                     iString *localPath = localFilePathFromUrl_String(d->mod.url);
                     if (!localPath) {
                         appendFormat_String(&str, "%s\n\n",
@@ -1195,7 +1196,7 @@ static void updateDocument_DocumentWidget_(iDocumentWidget *d, const iGmResponse
                     }
                     delete_String(localPath);
                     if (equalCase_Rangecc(urlScheme_String(d->mod.url), "file")) {
-                        appendFormat_String(&str, "=> %s/ View archive contents\n",
+                        appendFormat_String(&str, "=> %s/ ${doc.archive.view}\n",
                                             cstr_String(withSpacesEncoded_String(d->mod.url)));
                     }
                     translate_Lang(&str);