From 1b0ed856fdc2338926ca9389b20f2762a937f33c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C5=A0mahel?= <48548230+ceskyDJ@users.noreply.github.com> Date: Mon, 4 Oct 2021 20:03:51 +0200 Subject: [PATCH 01/11] Improve Czech language translation I found a bad tense in a message "deleted-preview", so I've updated it with better translation. --- packages/client/src/locales/cs.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/client/src/locales/cs.json b/packages/client/src/locales/cs.json index c2dc49e4..3995d59e 100644 --- a/packages/client/src/locales/cs.json +++ b/packages/client/src/locales/cs.json @@ -149,7 +149,7 @@ "contrast": "Kontrast", "message:loading-devices": "Načítání zařízení...", "message:no-devices": "Nebyla nalezena žádná zařízení", - "message:deleted-preview": "Odstranit náhled", + "message:deleted-preview": "Náhled byl odstraněn", "message:turn-documents": "Obrátit dokumenty", "message:preview-of-page": "Náhled strany" }, From 018e6400f0b58df3e0e1d976da4fb240d1ef46f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C5=A0mahel?= <48548230+ceskyDJ@users.noreply.github.com> Date: Mon, 4 Oct 2021 22:06:58 +0200 Subject: [PATCH 02/11] Fix Czech translation of turning documents --- packages/client/src/locales/cs.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/client/src/locales/cs.json b/packages/client/src/locales/cs.json index 3995d59e..6bc48b1b 100644 --- a/packages/client/src/locales/cs.json +++ b/packages/client/src/locales/cs.json @@ -150,7 +150,7 @@ "message:loading-devices": "Načítání zařízení...", "message:no-devices": "Nebyla nalezena žádná zařízení", "message:deleted-preview": "Náhled byl odstraněn", - "message:turn-documents": "Obrátit dokumenty", + "message:turn-documents": "Obraťte skenované dokumenty", "message:preview-of-page": "Náhled strany" }, From 023c3765c99b2a82c4331ca115f6c7d9547614f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C5=A0mahel?= <48548230+ceskyDJ@users.noreply.github.com> Date: Mon, 4 Oct 2021 22:07:30 +0200 Subject: [PATCH 03/11] Add "no." to page preview title --- packages/client/src/locales/cs.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/client/src/locales/cs.json b/packages/client/src/locales/cs.json index 6bc48b1b..298fa81a 100644 --- a/packages/client/src/locales/cs.json +++ b/packages/client/src/locales/cs.json @@ -151,7 +151,7 @@ "message:no-devices": "Nebyla nalezena žádná zařízení", "message:deleted-preview": "Náhled byl odstraněn", "message:turn-documents": "Obraťte skenované dokumenty", - "message:preview-of-page": "Náhled strany" + "message:preview-of-page": "Náhled strany č." }, "settings": { From 49927d7bc5b044b03d05a3740fa58054f58ae933 Mon Sep 17 00:00:00 2001 From: Rui Silva Date: Thu, 28 Oct 2021 10:53:18 +0100 Subject: [PATCH 04/11] chore: update pt-BR locale file This commit updates the Portuguese (Brazilian) locale file: - Update missing translations - Fix incorrect translations --- packages/client/src/locales/pt-BR.json | 90 +++++++++++++------------- 1 file changed, 44 insertions(+), 46 deletions(-) diff --git a/packages/client/src/locales/pt-BR.json b/packages/client/src/locales/pt-BR.json index e9373351..e975ef28 100644 --- a/packages/client/src/locales/pt-BR.json +++ b/packages/client/src/locales/pt-BR.json @@ -4,32 +4,32 @@ }, "about": { - "main": "scanservjs é uma interface via web simplea. Permite compartilhar via rede um ou mais scanners (pelo SANE) sem precisar instalação local. Permite gravar nos formatos TIF, JPG, PNG, PDF, y TXT (com Tesseract OCR) com diversas configurações de compressão, configuráveis. Suporta digitalizar multipágina e todos dispositivos SANE compatíveis.", + "main": "scanservjs é uma interface via web simples. Permite compartilhar via rede um ou mais scanners (via SANE) sem precisar instalação local. Permite gravar nos formatos TIF, JPG, PNG, PDF e TXT (com Tesseract OCR) com diversas configurações de compressão. Suporta digitalização multipágina e todos dispositivos SANE compatíveis.", "issue": "Relatar uma questão ou ver código fonte:", - "system-info": "System information" + "system-info": "Informação de sistema" }, "colors": { "accent-4": "Default", - "red": "Red", - "pink": "Pink", - "purple": "Purple", - "deep-purple": "Deep purple", - "indigo": "Indigo", - "blue": "Blue", - "light-blue": "Light blue", - "cyan": "Cyan", - "teal": "Teal", - "green": "Green", - "light-green": "Light green", - "lime": "Lime", - "yellow": "Yellow", - "amber": "Amber", - "orange": "Orange", - "deep-orange": "Deep orange", - "brown": "Brown", - "blue-grey": "Blue grey", - "grey": "Grey" + "red": "Vermelho", + "pink": "Rosa", + "purple": "Roxo", + "deep-purple": "Roxo escuro", + "indigo": "Índigo", + "blue": "Azul", + "light-blue": "Azul claro", + "cyan": "Ciano", + "teal": "Azul petróleo", + "green": "Verde", + "light-green": "Verde claro", + "lime": "Lima", + "yellow": "Amarelo", + "amber": "Âmbar", + "orange": "Laranja", + "deep-orange": "Laranja escuro", + "brown": "Castanho", + "blue-grey": "Azul acinzentado", + "grey": "Cinza" }, "batch-dialog": { @@ -43,15 +43,15 @@ "filename": "Nome do arquivo", "date": "Data", "size": "Tamanho", - "items-per-page": "Files per page", - "items-per-page-all": "All", + "items-per-page": "Itens por página", + "items-per-page-all": "Todos", "message:deleted": "Excluído {0}", - "message:renamed": "File renamed", - "button:delete-selected": "Delete Selected", - "dialog:rename": "Change file name", - "dialog:rename-cancel": "Cancel", - "dialog:rename-save": "Save", - "actions": "Actions" + "message:renamed": "Arquivo renomeado", + "button:delete-selected": "Deletar seleccionado", + "dialog:rename": "Mudar nome arquivo", + "dialog:rename-cancel": "Cancelar", + "dialog:rename-save": "Guardar", + "actions": "Ações" }, "navigation": { @@ -78,10 +78,9 @@ "mode": { "color": "Cor", - "halftone": "Meioton", + "halftone": "Meio-tom", "gray": "Cinza", - "lineart": "Artedelinha", - + "lineart": "Arte linear", "24bitcolor":"@:mode.color", "black & white": "@:mode.lineart", "gray(error diffusion)": "@:mode.halftone", @@ -91,13 +90,12 @@ "source": { "flatbed": "Flatbed", - "adf": "Automatic Document Feeder", + "adf": "Alimentador Automático de Documento", "auto": "Auto", - "left-aligned": "Left Aligned", - "centrally-aligned": "Centrally Aligned", + "left-aligned": "Alinhamento à Esquerda", + "centrally-aligned": "Alinhamento ao Centro", "duplex": "Duplex", "transparency unit": "Transparency Unit", - "automatic document feeder": "@:source.adf", "automatic document feeder(left aligned)": "@:source.adf (@:source.left-aligned)", "automatic document feeder(left aligned,duplex)": "@:source.adf (@:source.left-aligned, @:source.duplex)", @@ -122,8 +120,8 @@ "ledger": "Ledger", "junior-legal": "Junior legal", "half-letter": "Half letter", - "portrait": "Portrait", - "landscape": "Landscape" + "portrait": "Retrato", + "landscape": "Paisagem" }, "scan": { @@ -162,14 +160,14 @@ "theme": "Visual", "theme:description": "Visual. Se usa o tema System e muda, precisa recarregar a página.", "theme:system": "System", - "theme:light": "Light", - "theme:dark": "Dark", - "color": "Colour", - "color:description": "Colour. This will change the colour of the top app bar.", - "devices": "Devices and storage", - "reset:description": "Clears stored scanner devices and forces a reload", + "theme:light": "Claro", + "theme:dark": "Escuro", + "color": "Cor", + "color:description": "Cor. Irá mudar a cor da barra de navegação.", + "devices": "Dispositivos e armazenamento", + "reset:description": "Limpa scanner e força um refresh", "reset": "Reestablecer", - "clear-storage:description": "Clears local storage of any cached parameters", - "clear-storage": "Clear" + "clear-storage:description": "Limpa o armazenamento local de qualquer parâmetro cacheado", + "clear-storage": "Limpar" } } From 8807c4f6f7788966d82a70dbe444b74c4bf13051 Mon Sep 17 00:00:00 2001 From: Rui Silva Date: Thu, 28 Oct 2021 10:53:40 +0100 Subject: [PATCH 05/11] chore: add pt locale file This commit adds the Portuguese (Portugal) locale file --- packages/client/src/locales/pt.json | 191 ++++++++++++++++++++++++++++ 1 file changed, 191 insertions(+) create mode 100644 packages/client/src/locales/pt.json diff --git a/packages/client/src/locales/pt.json b/packages/client/src/locales/pt.json new file mode 100644 index 00000000..f81805dc --- /dev/null +++ b/packages/client/src/locales/pt.json @@ -0,0 +1,191 @@ +{ + "global": { + "application-name": "scanservjs" + }, + + "about": { + "main": "scanservjs é uma interface web para o seu scanner/digitalizador. Permite partilhar um ou mais scanners (através do SANE) em rede sem necessidade para drivers ou instalações complicadas. Permite guardar como TIF, JPG, PNG, PDF e TXT (com Tesseract OCR) com variadas definições de compressão, os quais podem ser configurados. Suporta digitalização multipágina e todos os dispositivos compatíveis com SANE.", + "issue": "Submeter um problema ou visualizar código-fonte:", + "system-info": "Informação de sistema" + }, + + "colors": { + "accent-4": "Predefinição", + "red": "Vermelho", + "pink": "Rosa", + "purple": "Roxo", + "deep-purple": "Roxo escuro", + "indigo": "Índigo", + "blue": "Azul", + "light-blue": "Azul claro", + "cyan": "Ciano", + "teal": "Azul petróleo", + "green": "Verde", + "light-green": "Verde claro", + "lime": "Lima", + "yellow": "Amarelo", + "amber": "Âmbar", + "orange": "Laranja", + "deep-orange": "Laranja escuro", + "brown": "Castanho", + "blue-grey": "Azul acinzentado", + "grey": "Cinza" + }, + + "batch-dialog": { + "btn-cancel": "Cancelar", + "btn-finish": "Terminar", + "btn-rescan": "Redigitalizar página", + "btn-next": "Próximo" + }, + + "files": { + "filename": "Nome do ficheiro", + "date": "Data", + "size": "Tamanho", + "items-per-page": "Itens por página", + "items-per-page-all": "Todos", + "message:deleted": "Eliminados {0}", + "message:renamed": "Ficheiro renomeado", + "button:delete-selected": "Eliminar seleccionados", + "dialog:rename": "Mudar nome de ficheiro", + "dialog:rename-cancel": "Cancelar", + "dialog:rename-save": "Guardar", + "actions": "Ações" + }, + + "navigation": { + "scan": "Digitalização", + "files": "Ficheiros", + "settings": "Definições", + "about": "Sobre", + "version": "Versão" + }, + + "batch-mode": { + "none": "Nenhum", + "manual": "Manual (com intervação)", + "auto": "Auto (Alimentador de documentos)", + "auto-collate-standard": "Auto (Ordenado 1, 3... 4, 2)", + "auto-collate-reverse": "Auto (Reverso 1, 3... 2, 4)" + }, + + "filter": { + "auto-level": "Nivel automático", + "threshold": "Limiar", + "blur": "Esbater" + }, + + "mode": { + "color": "Color", + "halftone": "Meio tom", + "gray": "Cinza", + "lineart": "Arte de linha", + + "24bitcolor":"@:mode.color", + "black & white": "@:mode.lineart", + "gray(error diffusion)": "@:mode.halftone", + "true gray": "@:mode.gray", + "24bit color(fast)": "@:mode.color" + }, + + "source": { + "flatbed": "Flatbed", + "adf": "ADF", + "auto": "Auto", + "left-aligned": "Alinhamento à Esquerda", + "centrally-aligned": "Alinhamento ao Centro", + "duplex": "Duplex", + "transparency unit": "Unidade de tranparência", + + "automatic document feeder": "@:source.adf", + "automatic document feeder(left aligned)": "@:source.adf (@:source.left-aligned)", + "automatic document feeder(left aligned,duplex)": "@:source.adf (@:source.left-aligned, @:source.duplex)", + "automatic document feeder(centrally aligned)": "@:source.adf (@:source.centrally-aligned)", + "automatic document feeder(centrally aligned,duplex)": "@:source.adf (@:source.centrally-aligned, @:source.duplex)" + }, + + "pipeline": { + "high-quality": "Qualidade alta", + "medium-quality": "Qualidade média", + "low-quality": "Qualidade baixa", + "uncompressed": "Sem compresão", + "lzw-compressed": "Compressão LZW", + "ocr": "OCR", + "text-file": "Ficheiro de texto" + }, + + "paper-size": { + "letter": "Letter", + "legal": "Legal", + "tabloid": "Tabloid", + "ledger": "Ledger", + "junior-legal": "Junior legal", + "half-letter": "Half letter", + "portrait": "Retrato", + "landscape": "Paisagem" + }, + + "scan": { + "device": "Dispositivo", + "source": "Fonte", + "resolution": "Resolução", + "mode": "Modo", + "dynamic-lineart": "Arte de linha Dinâmico", + "dynamic-lineart:enabled": "Ativado", + "dynamic-lineart:disabled": "Desativado", + "batch": "Lote", + "filters": "Filtros", + "format": "Formato", + "btn-preview": "Pré-visualziar", + "btn-clear": "Limpar", + "btn-scan": "Digitalizar", + "top": "Topo", + "left": "Esquerda", + "width": "Largura", + "height": "Altura", + "paperSize": "Tamanho do papel", + "brightness": "Brilho", + "contrast": "Contraste", + "message:loading-devices": "Carregando dispositivos...", + "message:no-devices": "Nenhum dispositivo encontrado", + "message:deleted-preview": "Eliminada pré-visualização", + "message:turn-documents": "Virar documentos", + "message:preview-of-page": "Pré-visualização de página" + }, + + "settings": { + "title": "@:navigation.settings", + "behaviour-ui": "Comportamento e Interface Visual", + "locale": "Língua", + "locale:description": "Escolher língua", + "theme": "Tema", + "theme:description": "Tema. Se utilizar o tema de sistema e alterá-lo, necessitará de recarregar a aplicação.", + "theme:system": "Sistema", + "theme:light": "Claro", + "theme:dark": "Escuro", + "color": "Cor", + "color:description": "Cor. Esta opção irá alterar a corra da barra de navegação.", + "devices": "Dispositivos e armazenamento", + "reset:description": "Limpa dispositivos guardados e força um recarregamento", + "reset": "Redefinir", + "clear-storage:description": "Limpa a local storage de qualquer parâmetro cacheado", + "clear-storage": "Limpar" + }, + + "locales": { + "cs": "Checo", + "de": "Alemão", + "en": "Inglês", + "es": "Espanhol", + "fr": "Francês", + "it": "Italiano", + "nl": "Holandês", + "pl": "Polaco", + "pt": "Português (Portugal)", + "pt-BR": "Português (Brasil)", + "ru": "Russo", + "zh": "Chinês", + "test": "Test" + } +} From ff9b470c88cb95c7004261b2c77fcc7fc36f8896 Mon Sep 17 00:00:00 2001 From: Rui Silva Date: Thu, 28 Oct 2021 10:54:08 +0100 Subject: [PATCH 06/11] chore: update locale list for en locale file --- packages/client/src/locales/en.json | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/client/src/locales/en.json b/packages/client/src/locales/en.json index e13ed92c..fb1ddcb8 100644 --- a/packages/client/src/locales/en.json +++ b/packages/client/src/locales/en.json @@ -182,6 +182,7 @@ "it": "Italiano", "nl": "Nederlands", "pl": "Polski", + "pt": "Portuguese (Portugal)", "pt-BR": "Portuguese (Brazilian)", "ru": "Russian", "zh": "简体中文", From 4d1c85dc0ea1fec0b1ae30090788882c16e017c5 Mon Sep 17 00:00:00 2001 From: Can Gelis Date: Sun, 31 Oct 2021 16:13:37 +0300 Subject: [PATCH 07/11] Add Turkish locale --- packages/client/src/locales/en.json | 1 + packages/client/src/locales/tr.json | 175 ++++++++++++++++++++++++++++ 2 files changed, 176 insertions(+) create mode 100644 packages/client/src/locales/tr.json diff --git a/packages/client/src/locales/en.json b/packages/client/src/locales/en.json index fb1ddcb8..67aa3a55 100644 --- a/packages/client/src/locales/en.json +++ b/packages/client/src/locales/en.json @@ -185,6 +185,7 @@ "pt": "Portuguese (Portugal)", "pt-BR": "Portuguese (Brazilian)", "ru": "Russian", + "tr": "Türkçe", "zh": "简体中文", "test": "Test" } diff --git a/packages/client/src/locales/tr.json b/packages/client/src/locales/tr.json new file mode 100644 index 00000000..34944ff0 --- /dev/null +++ b/packages/client/src/locales/tr.json @@ -0,0 +1,175 @@ +{ + "global": { + "application-name": "scanservjs" + }, + + "about": { + "main": "scanservjs tarayıcınız için basit bir web arayüzüdür. Bir veya birden fazla tarayıcıyı ağ üzerinden (SANE kullanarak), kolay kurulum ve sürücü gerektirmeden paylaşmanızı sağlar. TIF, JPG, PNG, PDF ve TXT (Tesseract OCR ile) dosya uzantıları ile çeşitli sıkıştırma ayarlarıyla kaydedebilir ve tümü ayarlanabilir. Çoklu sayfa taramasını ve tüm SANE uyumlu cihazları destekler.", + "issue": "Sorun bildirin veya kaynak kodu görüntüleyin:", + "system-info": "Sistem bilgisi" + }, + + "colors": { + "accent-4": "Varsayılan", + "red": "Kırmızı", + "pink": "Pembe", + "purple": "Mor", + "deep-purple": "Koyu mor", + "indigo": "Çivit mavisi", + "blue": "Mavi", + "light-blue": "Açık mavi", + "cyan": "Camgöbeği", + "teal": "Teal", + "green": "Yeşil", + "light-green": "Açık yeşil", + "lime": "Lime", + "yellow": "Sarı", + "amber": "Amber", + "orange": "Turuncu", + "deep-orange": "Koyu turuncu", + "brown": "Kahverengi", + "blue-grey": "Mavi gri", + "grey": "Gri" + }, + + "batch-dialog": { + "btn-cancel": "İptal", + "btn-finish": "Bitir", + "btn-rescan": "Sayfayı tekrar tara", + "btn-next": "İleri" + }, + + "files": { + "filename": "Dosya adı", + "date": "Tarih", + "size": "Boyut", + "items-per-page": "Sayfa başı dosya", + "items-per-page-all": "Tümü", + "message:deleted": "Silindi {0}", + "message:renamed": "İsimlendirilen dosya", + "button:delete-selected": "Seçileni Sil", + "dialog:rename": "Dosya adını değiştir", + "dialog:rename-cancel": "İptal", + "dialog:rename-save": "Kaydet", + "actions": "Eylemler" + }, + + "navigation": { + "scan": "Tara", + "files": "Dosyalar", + "settings": "Ayarlar", + "about": "Hakkında", + "version": "Versiyon" + }, + + "batch-mode": { + "none": "Hiçbiri", + "manual": "Manüel (istemci ile)", + "auto": "Oto (Döküman besleyici)", + "auto-collate-standard": "Oto (Sıraya koy 1, 3... 4, 2)", + "auto-collate-reverse": "Oto (Ters 1, 3... 2, 4)" + }, + + "filter": { + "auto-level": "Oto serviye", + "threshold": "Eşik", + "blur": "Bulanıklık" + }, + + "mode": { + "color": "Renk", + "halftone": "Yarım ton", + "gray": "Gri", + "lineart": "Lineart", + + "24bitcolor":"@:mode.color", + "black & white": "@:mode.lineart", + "gray(error diffusion)": "@:mode.halftone", + "true gray": "@:mode.gray", + "24bit color(fast)": "@:mode.color" + }, + + "source": { + "flatbed": "Düz platform", + "adf": "ADF", + "auto": "Oto", + "left-aligned": "Sola hizalı", + "centrally-aligned": "Ortaya hizalı", + "duplex": "Arkalı önlü", + "transparency unit": "Şeffaflık Birimi", + + "automatic document feeder": "@:source.adf", + "automatic document feeder(left aligned)": "@:source.adf (@:source.left-aligned)", + "automatic document feeder(left aligned,duplex)": "@:source.adf (@:source.left-aligned, @:source.duplex)", + "automatic document feeder(centrally aligned)": "@:source.adf (@:source.centrally-aligned)", + "automatic document feeder(centrally aligned,duplex)": "@:source.adf (@:source.centrally-aligned, @:source.duplex)" + }, + + "pipeline": { + "high-quality": "Yüksek kalite", + "medium-quality": "Orta kalite", + "low-quality": "Düşük kalite", + "uncompressed": "Sıkıştırma", + "lzw-compressed": "LZW Sıkıştırma", + "ocr": "OCR", + "text-file": "Metin dosyası" + }, + + "paper-size": { + "letter": "Letter", + "legal": "Legal", + "tabloid": "Tabloid", + "ledger": "Ledger", + "junior-legal": "Junior legal", + "half-letter": "Yarım letter", + "portrait": "Dikey", + "landscape": "Yatay" + }, + + "scan": { + "device": "Cihaz", + "source": "Kaynak", + "resolution": "Çözünürlük", + "mode": "Mod", + "dynamic-lineart": "Dinamik Lineart", + "dynamic-lineart:enabled": "Etkin", + "dynamic-lineart:disabled": "Devredışı", + "batch": "Yığın", + "filters": "Filtreler", + "format": "Format", + "btn-preview": "Ön izleme", + "btn-clear": "Temizle", + "btn-scan": "Tara", + "top": "Üst", + "left": "Sol", + "width": "En", + "height": "Boy", + "paperSize": "Sayfa boyutu", + "brightness": "Parlaklık", + "contrast": "Kontrast", + "message:loading-devices": "Cihazlar yükleniyor...", + "message:no-devices": "Hiç cihaz bulunamadı", + "message:deleted-preview": "Önizleme silindi", + "message:turn-documents": "Dökümanı çevir", + "message:preview-of-page": "Sayfaynın önizlemesi" + }, + + "settings": { + "title": "@:navigation.settings", + "behaviour-ui": "Davranış ve arayüz", + "locale": "Dil", + "locale:description": "Dilinizi seçiniz", + "theme": "Tema", + "theme:description": "Tema. Sistem teması kullanırken değiştirirseniz, uygulamayı tekrar yüklemeniz gerekir.", + "theme:system": "Sistem", + "theme:light": "Açık", + "theme:dark": "Koyu", + "color": "Renk", + "color:description": "Renk. Üst barın rengini değiştirir.", + "devices": "Cihazlar ve depolama", + "reset:description": "Kayıtlı cihazları temizler ve yeniden yükler", + "reset": "Sıfırla", + "clear-storage:description": "Depolanmış önbellekteki parametreleri temizler", + "clear-storage": "Temizle" + }, +} From 8cd47dff07ad6c03a630539c19148be865d43a1d Mon Sep 17 00:00:00 2001 From: sbs20 Date: Sun, 31 Oct 2021 15:46:45 +0000 Subject: [PATCH 08/11] Docker - alpine for builder --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9d61710f..3e681463 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ -# Builder image. Alpine doesn't have python which is required by node-sass -FROM node:14-buster AS builder +# Builder image. +FROM node:14-alpine AS builder ENV APP_DIR=/app WORKDIR "$APP_DIR" From 58a76ee7d467d0c822f66c85408f9260850fd986 Mon Sep 17 00:00:00 2001 From: sbs20 Date: Sun, 31 Oct 2021 15:51:25 +0000 Subject: [PATCH 09/11] Version bump --- package-lock.json | 4 ++-- package.json | 2 +- packages/client/package-lock.json | 4 ++-- packages/client/package.json | 2 +- packages/server/package-lock.json | 4 ++-- packages/server/package.json | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2abaccb1..75f3bc78 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "scanservjs", - "version": "2.18.0", + "version": "2.18.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "scanservjs", - "version": "2.18.0", + "version": "2.18.1", "hasInstallScript": true, "license": "GPL-2.0" } diff --git a/package.json b/package.json index c02e25d8..9faf4a31 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "scanservjs", - "version": "2.18.0", + "version": "2.18.1", "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.", "scripts": { "clean": "rm -rf ./dist", diff --git a/packages/client/package-lock.json b/packages/client/package-lock.json index 6a5a4b05..69c71bc0 100644 --- a/packages/client/package-lock.json +++ b/packages/client/package-lock.json @@ -1,12 +1,12 @@ { "name": "scanservjs", - "version": "2.18.0", + "version": "2.18.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "scanservjs", - "version": "2.18.0", + "version": "2.18.1", "license": "GPL-2.0", "dependencies": { "@mdi/font": "^5.9.55", diff --git a/packages/client/package.json b/packages/client/package.json index db896874..b736d71c 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "scanservjs", - "version": "2.18.0", + "version": "2.18.1", "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.", "author": "Sam Strachan", "scripts": { diff --git a/packages/server/package-lock.json b/packages/server/package-lock.json index eeaac868..9b756f48 100644 --- a/packages/server/package-lock.json +++ b/packages/server/package-lock.json @@ -1,12 +1,12 @@ { "name": "scanservjs-server", - "version": "2.18.0", + "version": "2.18.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "scanservjs-server", - "version": "2.18.0", + "version": "2.18.1", "license": "GPL-2.0", "dependencies": { "adm-zip": "^0.5.5", diff --git a/packages/server/package.json b/packages/server/package.json index 9a7fb3ab..785cb8ac 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,6 +1,6 @@ { "name": "scanservjs-server", - "version": "2.18.0", + "version": "2.18.1", "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.", "scripts": { "lint": "gulp lint", From 29e9921cac125079a8c70cada6759613e1ba1fb8 Mon Sep 17 00:00:00 2001 From: sbs20 Date: Sun, 31 Oct 2021 15:58:03 +0000 Subject: [PATCH 10/11] Portuguese and Turkish #154 --- README.md | 2 +- packages/client/src/classes/constants.js | 2 ++ packages/client/src/locales/tr.json | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index eb8b496f..9788d541 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,7 @@ complicated installation. * Configurable overrides for all defaults as well as filters and formats * Multipage scanning (with collation for double sided scans) * International translations: Czech, Dutch, French, German, Italian, Mandarin, - Polish, Portuguese (BR), Russian, Spanish; + Polish, Portuguese (PT & BR), Russian, Spanish, Turkish; [Help requested](https://github.com/sbs20/scanservjs/issues/154) * Light and dark mode * Responsive design diff --git a/packages/client/src/classes/constants.js b/packages/client/src/classes/constants.js index 0dff5f3c..1cd59b66 100644 --- a/packages/client/src/classes/constants.js +++ b/packages/client/src/classes/constants.js @@ -27,8 +27,10 @@ const Constants = { 'it', 'nl', 'pl', + 'pt', 'pt-BR', 'ru', + 'tr', 'zh', 'test' ], diff --git a/packages/client/src/locales/tr.json b/packages/client/src/locales/tr.json index 34944ff0..1a3c4176 100644 --- a/packages/client/src/locales/tr.json +++ b/packages/client/src/locales/tr.json @@ -171,5 +171,5 @@ "reset": "Sıfırla", "clear-storage:description": "Depolanmış önbellekteki parametreleri temizler", "clear-storage": "Temizle" - }, + } } From d0936894e153d8ca35c57f5406e94313929bb799 Mon Sep 17 00:00:00 2001 From: sbs20 Date: Sun, 31 Oct 2021 16:07:45 +0000 Subject: [PATCH 11/11] RClone recipe #363 --- docs/integration.md | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/docs/integration.md b/docs/integration.md index 8274f1e9..38ef5bc6 100644 --- a/docs/integration.md +++ b/docs/integration.md @@ -2,7 +2,7 @@ It's not uncommon to want to integrate scanservjs with other software - you may wish to upload scans to Dropbox, paperless-ng or some other location. The -possibilities are endless and deep integration into the UI would add cruft for +possibilities are endless but deep integration into the UI would add cruft for the vast majority of users. Thankfully, the files just end up in a location on your filesystem so you are @@ -22,6 +22,39 @@ about paperless-ng resulted in You could integrate with Dropbox using [Dropbox-Uploader](https://github.com/andreafabrizi/Dropbox-Uploader) +## Recipe for Scan2Cloud + +This recipe covers all major cloud providers such as Amazon, Dropbox, Google +(Drive/Photos), Microsoft (Azure Blob Storage, OneDrive), Nextcloud (via +WebDav), a network share of your choice (S/FTP) and many +[more](https://rclone.org/overview/) by using [Rclone](https://rclone.org/). + +1. Install [Rclone](https://rclone.org/) as described + [here](https://rclone.org/install/) +2. Configure your [Cloud Provider or Remote](https://rclone.org/overview/) + accordingly, for example [Nextcloud via Webdav](https://rclone.org/webdav/) + or [Google Drive](https://rclone.org/drive/) + +Now you have a choice. If you want the update to occur on the scan itself then +you need to integrate into the pipeline. Alternatively, sync the output +directory itself and use either inotify or cron. If you want to embed into the +pipeline then something like the following may help: + +```javascript +config.pipelines.push({ + extension: 'pdf', + description: 'PDF | Scan2Cloud ⇒ Your_Configured_Provider_or_Remote ', + get commands() { + return [ + 'convert @- -quality 92 tmp-%04d.jpg && ls tmp-*.jpg', + 'convert @- pdf:-', + `rclone copy *.pdf YOUR_PROVIDER:/path/to/folder`, + 'ls scan_*.*' + ]; + } +}); +``` + ## Scan2Mail 1. Setup and configure [msmtp](https://wiki.debian.org/msmtp) and msmtp-mta as