From e8fa404519cd9080a1629bc853f4ec8d2baae12d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Apr 2024 09:37:50 +0100 Subject: [PATCH 1/2] Bump vite from 4.5.2 to 4.5.3 (#1240) Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 4.5.2 to 4.5.3. - [Release notes](https://github.com/vitejs/vite/releases) - [Changelog](https://github.com/vitejs/vite/blob/v4.5.3/packages/vite/CHANGELOG.md) - [Commits](https://github.com/vitejs/vite/commits/v4.5.3/packages/vite) --- updated-dependencies: - dependency-name: vite dependency-type: direct:development ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 735e7466f..f48d579af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -39,7 +39,7 @@ "selenium-webdriver": "^4.11.1", "start-server-and-test": "^2.0.0", "testcafe": "^3.0.0", - "vite": "^4.5.2" + "vite": "^4.5.3" }, "engines": { "node": ">=10" @@ -10421,9 +10421,9 @@ } }, "node_modules/vite": { - "version": "4.5.2", - "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.2.tgz", - "integrity": "sha512-tBCZBNSBbHQkaGyhGCDUGqeo2ph8Fstyp6FMSvTtsXeZSPpSMGlviAOav2hxVTqFcx8Hj/twtWKsMJXNY0xI8w==", + "version": "4.5.3", + "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.3.tgz", + "integrity": "sha512-kQL23kMeX92v3ph7IauVkXkikdDRsYMGTVl5KY2E9OY4ONLvkHf04MDTbnfo6NKxZiDLWzVpP5oTa8hQD8U3dg==", "dev": true, "dependencies": { "esbuild": "^0.18.10", @@ -18388,9 +18388,9 @@ } }, "vite": { - "version": "4.5.2", - "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.2.tgz", - "integrity": "sha512-tBCZBNSBbHQkaGyhGCDUGqeo2ph8Fstyp6FMSvTtsXeZSPpSMGlviAOav2hxVTqFcx8Hj/twtWKsMJXNY0xI8w==", + "version": "4.5.3", + "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.3.tgz", + "integrity": "sha512-kQL23kMeX92v3ph7IauVkXkikdDRsYMGTVl5KY2E9OY4ONLvkHf04MDTbnfo6NKxZiDLWzVpP5oTa8hQD8U3dg==", "dev": true, "requires": { "esbuild": "^0.18.10", diff --git a/package.json b/package.json index cbe8f87b9..0d043e590 100644 --- a/package.json +++ b/package.json @@ -62,6 +62,6 @@ "selenium-webdriver": "^4.11.1", "start-server-and-test": "^2.0.0", "testcafe": "^3.0.0", - "vite": "^4.5.2" + "vite": "^4.5.3" } } From 285878c68041148eaf4930c5b78b2355c749bfc7 Mon Sep 17 00:00:00 2001 From: Dan Niles <56271899+dan-niles@users.noreply.github.com> Date: Mon, 8 Apr 2024 14:10:27 +0530 Subject: [PATCH 2/2] Fix typos in About tab (#1242) Signed off by @dan-niles. --- i18n/en.jsonp.js | 6 +++--- www/index.html | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/i18n/en.jsonp.js b/i18n/en.jsonp.js index 1d8b3ff17..d0f03d992 100644 --- a/i18n/en.jsonp.js +++ b/i18n/en.jsonp.js @@ -234,13 +234,13 @@ document.localeJson = { "about-step2-para1": "Download your chosen content and/or copy it into a dedicated ZIM folder on your device's storage. Check the size before you download archives as many file sizes are very large (several Gigabytes). Themed versions such as WikiMed, or versions without images, are much smaller than full Wikipedia archives and can be readily downloaded in your browser.", "about-step2-para2": "If you don't have enough internal storage, consider using a modern microSD card, an external hard drive, or thumb drive. For larger archives (greater than 2GB) on older devices, it is possible that an archive might not be supported if your storage is formatted using a FAT filesystem (NB exFAT is fine). See Downloading large archives below for a solution.", "about-step3": "Step 3: Select your file or drag-and-drop", - "about-step3-para1": "Go to the \"Configure\" menu and select your archive, or select the folder containing your ZIM archives if you are offered that option. You can also drag and drop the file into the the open app (if you have a split file, be sure to drag all parts).", + "about-step3-para1": "Go to the \"Configure\" menu and select your archive, or select the folder containing your ZIM archives if you are offered that option. You can also drag and drop the file into the open app (if you have a split file, be sure to drag all parts).", "about-step4": "Step 4: Enjoy your offline content!", "about-search-title": "Title and full-text search usage", "about-search-para1": "There are three types of search:", "about-search-para2": "Title search matches the start of an article title, so if you search for 'France' you will get 'France (country)', 'France (disambiguation)', 'France (film)', etc. This kind of search tries to be case-insensitive, but the number of case variants tried is necessarily limited. If not enough results are returned, you can increase the maximum number of search results using the slider in Configuration.", "about-search-para3": "Alphabetical search: If you type a letter of the alphabet in the search box (upper case may be most useful), it will show an alphabetical list of articles starting with that letter. This is useful for ZIM archives that have descriptive rather than semantic titles (e.g. TED Talks). You can also display a list of all titles (up to the limit set in Configuration) simply by clicking the search button without typing anything.", - "about-search-para4": "Full-text search: This type of search is only availalbe in relatively recent desktop browsers, and if the archive contains a full-text index. If it is supported, it will be used automatically, but it is slower than title search, and you may notice a delay before the results are added to the title-search results. Additionally, full-text search cannot be used if your archive is split into various chunks. To see whether it is available, look in the API panel at the bottom of the Configuration page after you have loaded a ZIM. If it says \"Xapian [fulltext]\" then it should be automatically enabled for that ZIM.", + "about-search-para4": "Full-text search: This type of search is only available in relatively recent desktop browsers, and if the archive contains a full-text index. If it is supported, it will be used automatically, but it is slower than title search, and you may notice a delay before the results are added to the title-search results. Additionally, full-text search cannot be used if your archive is split into various chunks. To see whether it is available, look in the API panel at the bottom of the Configuration page after you have loaded a ZIM. If it says \"Xapian [fulltext]\" then it should be automatically enabled for that ZIM.", "about-remove-navbars": "Removing navigation bars", "about-remove-navbars-para1": "The default setting is for the top and bottom navigation bars to slide away when you scroll down and slide back when you scroll up. However, in some ZIM archives, e.g. PhET, it is not possible to scroll, and the navigation bars can obscure some content. In this case, in most browsers you can swipe decisively up or down on the window (with touch or with the mouse wheel/touchpad) to toggle the display of the navigation bars. In all browsers, you can also use the Ctrl/Cmd + UpArrow/DownArrow keys.", "about-image-download-para1": "Unfortunately, it is not usually possible to download and save an image from a ZIM article using the context menu (after right-clicking or long-pressing the image). One workaround is to choose \"Copy Image\" in the context menu, then paste it in any suitable software (Paint, Gimp etc, or even a Word processor), and then save it from there.", @@ -253,7 +253,7 @@ document.localeJson = { "about-zim-format-para2": "This application is now fully compatible with archives that are created by Zimit (https://youzim.it ) using the Web Archive (WARC) format, so long as your browser supports ServiceWorker mode. If you can only use Safe mode (or ServiceWorkerLocal), we do our best to show you the static content of the requested article (no JavaScript can run in this mode). This will work for some basic static sites, but many will look broken. Search for content in the usual way.", "about-large-archives-para1": "Full versions of Wikipedia can be enormous: French, German and Spanish Wikipedia with images are each >25GB; full English Wikipedia with images is >90GB. For these very large archives you can find convenient BitTorrent links provided by library.kiwix.org , which may be more reliable than attempting to use your browser. You can use an open-source BitTorrent client such as QBittorrent  with these links (install the software before clicking on the torrent link).", "about-large-archives-para2": "If you need to store a large ZIM archive on an older filesystem formatted as FAT16 or FAT32, you need to be aware of the file size limits of those systems (FAT16 < 2GiB; FAT32 < 4GiB). Most modern microSD cards, thumb drives or hard drives are formatted as exFAT or another modern FS such as NTFS, which do not have this issue. If your ZIM archive is larger than the FS limit, it is possible to split the archive into several 2GiB-1 or 4GiB-1 files (or smaller). You will need to give a file extension to each chunk in the right order following this pattern: *.zimaa, *.zimab, *.zimac, ..., etc.). When you pick this archive in the app, be sure to pick all the chunks, or drag-and-drop them all into the app.", - "about-large-archives-para3": "For some information on how to split archves, see Download a ZIM archive .", + "about-large-archives-para3": "For some information on how to split archives, see Download a ZIM archive .", "about-contentinjection-para1": "Depending on your browser or framework, this app may be capable of running in different modes, which we call \"ServiceWorker Mode\" and \"Safe Mode\". There is a toggle under Compatibility Settings in Configuration that allows you to select between these. Here is a technical explanation of what these modes do:", "about-contentinjection-para2": "ServiceWorker Mode: This is the default mode. As its name implies, it requires that the browser or framework be capable of installing a Service Worker, which is usually the case in modern browsers. It works by intercepting the browser or framework's Fetch calls (network requests) and supplying the requested content from the ZIM. In this mode, the content is read and supplied as-is from the archive to the browser. Dynamic content (e.g. JavaScript) and proprietary UIs are fully supported in this mode. This mode can feel initially a little slower than Safe mode until commonly used assets are cached, but it soon equals Safe mode in speed, at least in modern browsers. However, older browsers such as IE11 are incompatible with this mode, and the app must be running in a secure context (https:, localhost, or certain browser extensions). While this mode is not natively supported in Mozilla (Firefox) browser extensions, we provide a functional workaround by re-launching the extension as a Progressive Web App (PWA). Note that this mode cannot run with the file: protocol (but only IE11 and old Edge allow the app to run by launching index.html from the file system).", "about-contentinjection-para3": "ServiceWorkerLocal Mode: This is only available in Chromium extensions. It is the same as above, but due to very tight security restrictions in these extensions, no inline JavaScript or eval statements can run. Unfortunately, modern ZIMs may have such dynamic content, and so functionality may be restricted in this mode. Nevertheless, it is more secure: the content is sandboxed and no one-time server access is required to enable the Service Worker. You are protected from inline code execution at the cost of loss of some features in dynamic ZIMs.", diff --git a/www/index.html b/www/index.html index e341e404b..e25b8642a 100644 --- a/www/index.html +++ b/www/index.html @@ -209,8 +209,8 @@

Step 2: Download or copy the content onto your devic

Step 3: Select your file or drag-and-drop

- Go to the "Configure" menu and select your archive, or select the folder containing your ZIM archives if you are offered that option. You can also drag and drop the file into the - the open app (if you have a split file, be sure to drag all parts). + Go to the "Configure" menu and select your archive, or select the folder containing your ZIM archives if you are offered that option. You can also drag and drop the file into the + open app (if you have a split file, be sure to drag all parts).

Step 4: Enjoy your offline content!

↑ Back to Contents

@@ -230,7 +230,7 @@

Title and full-text search display a list of all titles (up to the limit set in Configuration) simply by clicking the search button without typing anything.

- Full-text search: This type of search is only availalbe in relatively recent desktop browsers, and if the archive contains a full-text index. + Full-text search: This type of search is only available in relatively recent desktop browsers, and if the archive contains a full-text index. If it is supported, it will be used automatically, but it is slower than title search, and you may notice a delay before results are added to the title-search results. Additionally, full-text search cannot be used if your archive is split into various chunks. To see whether it is available, look in the API panel at the bottom of the Configuration page after you have loaded a ZIM. If it says "Xapian [fulltext]" then @@ -311,7 +311,7 @@

Downloading and storing large archives

..., etc.). When you pick this archive in the app, be sure to pick all the chunks, or drag-and-drop them all into the app.

- For some information on how to split archves, see + For some information on how to split archives, see Download a ZIM archive .

↑ Back to Contents

@@ -432,7 +432,7 @@

Main libraries and resources used:

  • The Rollup JavaScript Bundler, copyright by the contributors, released under an MIT Licence
  • Vite Frontend Tooling, copyright Yuxi You and Vite contributors, released under an MIT Licence
  • The TestCafé suite, copyright Developer Express Inc., released under an MIT Licence
    • -
  • Selenium WebDriver, copyright The Software Freedom Conservancy, released under an Apache Lincence v2
    • +
  • Selenium WebDriver, copyright The Software Freedom Conservancy, released under an Apache Licence v2
  • Mocha Testing Framework, copyright The OpenJS Foundation and Mocha contributors, released under a Creative Commons Attribution 4.0 International Licence
  • i18next Internationalization Framework, copyright i18next, released under an MIT Licence