Merge pull request #152 from sbs20/development

i18n #151
sbs20 · Mar 29, 2021 · e5c42cd · e5c42cd
2 parents 2d98999 + 7206b2d
commit e5c42cd
Show file tree

Hide file tree

Showing 22 changed files with 1,536 additions and 916 deletions.
diff --git a/README.md b/README.md
@@ -14,9 +14,20 @@
 
 scanservjs is a web-based UI for your scanner. It allows you to share one or
 more scanners (using SANE) on a network without the need for drivers or
-complicated installation. It enables easy cropping, sources, resolution, output
-formats (TIF, JPG, PNG, PDF and TXT with Tesseract OCR) with varying compression
-settings, all of which can be configured. It supports multipage scanning and all
+complicated installation.
+
+### Features
+* Cropping
+* Source selection (Flatbed / ADF)
+* Resolution
+* Output formats (TIF, JPG, PNG, PDF and TXT with Tesseract OCR) with varying
+  compression settings
+* Configurable overrides for all defaults as well as filters and formats
+* Multipage scanning (with collation for double sided scans)
+* Light and dark mode
+* **NEW**: International translations (**help requested**)
+
+It supports any
 [SANE compatible devices](http://www.sane-project.org/sane-supported-devices.html).
 
 ![screenshot](https://github.com/sbs20/scanservjs/raw/master/docs/screen0.png)

diff --git a/docs/development.md b/docs/development.md
@@ -36,6 +36,7 @@ cd server && gulp release
 
 ## References
 * [Run server with webpack](https://dennisreimann.de/articles/vue-cli-serve-express.html)
+* [i18n](https://www.codeandweb.com/babeledit/tutorials/how-to-translate-your-vue-app-with-vue-i18n)
 
 ## Docker
 

diff --git a/server/package-lock.json b/server/package-lock.json
diff --git a/server/package.json b/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "scanservjs-server",
-  "version": "2.7.1",
+  "version": "2.8.0",
   "description": "scanservjs is a simple web-based UI for SANE which allows you to share a scanner on a network without the need for drivers or complicated installation. scanserv does not do image conversion or manipulation (beyond the bare minimum necessary for the purposes of browser preview) or OCR.",
   "scripts": {
     "serve": "nodemon --exec 'vue-cli-service serve'",

diff --git a/server/src/config.js b/server/src/config.js
@@ -56,39 +56,39 @@ class Config {
 
       filters: [
         {
-          description: 'Auto level',
+          description: 'filters:auto-level',
           params: '-auto-level'
         },
         {
-          description: 'Threshold',
+          description: 'filters:threshold',
           params: '-channel RGB -threshold 80%'
         },
         {
-          description: 'Blur',
+          description: 'filters:blur',
           params: '-blur 1'
         }
       ],
 
       pipelines: [
         {
           extension: 'jpg',
-          description: 'JPG | High quality',
+          description: 'JPG | @:pipeline.high-quality',
           commands: [
             'convert @- -quality 92 scan-%04d.jpg',
             'ls scan-*.*'
           ]
         },
         {
           extension: 'jpg',
-          description: 'JPG | Medium quality',
+          description: 'JPG | @:pipeline.medium-quality',
           commands: [
             'convert @- -quality 75 scan-%04d.jpg',
             'ls scan-*.*'
           ]
         },
         {
           extension: 'jpg',
-          description: 'JPG | Low quality',
+          description: 'JPG | @:pipeline.low-quality',
           commands: [
             'convert @- -quality 50 scan-%04d.jpg',
             'ls scan-*.*'
@@ -104,31 +104,31 @@ class Config {
         },
         {
           extension: 'tif',
-          description: 'TIF | Uncompressed',
+          description: 'TIF | @:pipeline.uncompressed',
           commands: [
             'convert @- scan-0000.tif',
             'ls scan-*.*'
           ]
         },
         {
           extension: 'tif',
-          description: 'TIF | LZW compression',
+          description: 'TIF | @:pipeline.lzw-compressed',
           commands: [
             'convert @- -compress lzw scan-0000.tif',
             'ls scan-*.*'
           ]
         },
         {
           extension: 'pdf',
-          description: 'PDF (TIF | Uncompressed)',
+          description: 'PDF (TIF | @:pipeline.uncompressed)',
           commands: [
             'convert @- scan-0000.pdf',
             'ls scan-*.*'
           ]
         },
         {
           extension: 'pdf',
-          description: 'PDF (TIF | LZW Compression)',
+          description: 'PDF (TIF | @:pipeline.lzw-compressed)',
           commands: [
             'convert @- -compress lzw tmp-%04d.tif && ls tmp-*.tif',
             'convert @- scan-0000.pdf',
@@ -137,7 +137,7 @@ class Config {
         },
         {
           extension: 'pdf',
-          description: 'PDF (JPG | High quality)',
+          description: 'PDF (JPG | @:pipeline.high-quality)',
           commands: [
             'convert @- -quality 92 tmp-%04d.jpg && ls tmp-*.jpg',
             'convert @- scan-0000.pdf',
@@ -146,7 +146,7 @@ class Config {
         },
         {
           extension: 'pdf',
-          description: 'PDF (JPG | Medium quality)',
+          description: 'PDF (JPG | @:pipeline.medium-quality)',
           commands: [
             'convert @- -quality 75 tmp-%04d.jpg && ls tmp-*.jpg',
             'convert @- scan-0000.pdf',
@@ -155,7 +155,7 @@ class Config {
         },
         {
           extension: 'pdf',
-          description: 'PDF (JPG | Low quality)',
+          description: 'PDF (JPG | @:pipeline.low-quality)',
           commands: [
             'convert @- -quality 50 tmp-%04d.jpg && ls tmp-*.jpg',
             'convert @- scan-0000.pdf',
@@ -168,7 +168,7 @@ class Config {
     this.pipelines = this.pipelines.concat([
       {
         extension: 'pdf',
-        description: 'OCR | PDF (JPG | High quality)',
+        description: '@:pipeline.ocr | PDF (JPG | @:pipeline.high-quality)',
         commands: [
           'convert @- -quality 92 tmp-%d.jpg && ls tmp-*.jpg',
           `${this.tesseract} -l ${this.ocrLanguage} -c stream_filelist=true - - pdf > scan-0001.pdf`,
@@ -177,7 +177,7 @@ class Config {
       },
       {
         extension: 'txt',
-        description: 'OCR | Text file',
+        description: '@:pipeline.ocr | @:pipeline.text-file',
         commands: [
           `${this.tesseract} -l ${this.ocrLanguage} -c stream_filelist=true - - txt > scan-0001.txt`,
           'ls scan-*.*'

diff --git a/webui/.env b/webui/.env
@@ -0,0 +1,2 @@
+VUE_APP_I18N_LOCALE=en
+VUE_APP_I18N_FALLBACK_LOCALE=en
diff --git a/webui/babel.config.js b/webui/babel.config.js
@@ -2,4 +2,4 @@ module.exports = {
   presets: [
     '@vue/cli-plugin-babel/preset'
   ]
-}
+};
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		VUE_APP_I18N_LOCALE=en
		VUE_APP_I18N_FALLBACK_LOCALE=en
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,4 +2,4 @@ module.exports = { @@
       presets: [
         '@vue/cli-plugin-babel/preset'
       ]
-    }
+    };