Skip to content

Commit

Permalink
Merge pull request #371 from sbs20/staging
Browse files Browse the repository at this point in the history
Locales (PT & TR), Alpine builder; doc
  • Loading branch information
sbs20 authored Oct 31, 2021
2 parents 89192b9 + 6e22649 commit 9d0c0af
Show file tree
Hide file tree
Showing 15 changed files with 463 additions and 62 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -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"

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
35 changes: 34 additions & 1 deletion docs/integration.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
4 changes: 2 additions & 2 deletions packages/client/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/client/package.json
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
2 changes: 2 additions & 0 deletions packages/client/src/classes/constants.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,10 @@ const Constants = {
'it',
'nl',
'pl',
'pt',
'pt-BR',
'ru',
'tr',
'zh',
'test'
],
Expand Down
6 changes: 3 additions & 3 deletions packages/client/src/locales/cs.json
Original file line number Diff line number Diff line change
Expand Up @@ -149,9 +149,9 @@
"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:turn-documents": "Obrátit dokumenty",
"message:preview-of-page": "Náhled strany"
"message:deleted-preview": "Náhled byl odstraněn",
"message:turn-documents": "Obraťte skenované dokumenty",
"message:preview-of-page": "Náhled strany č."
},

"settings": {
Expand Down
2 changes: 2 additions & 0 deletions packages/client/src/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -182,8 +182,10 @@
"it": "Italiano",
"nl": "Nederlands",
"pl": "Polski",
"pt": "Portuguese (Portugal)",
"pt-BR": "Portuguese (Brazilian)",
"ru": "Russian",
"tr": "Türkçe",
"zh": "简体中文",
"test": "Test"
}
Expand Down
90 changes: 44 additions & 46 deletions packages/client/src/locales/pt-BR.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand All @@ -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": {
Expand All @@ -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",
Expand All @@ -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)",
Expand All @@ -122,8 +120,8 @@
"ledger": "Ledger",
"junior-legal": "Junior legal",
"half-letter": "Half letter",
"portrait": "Portrait",
"landscape": "Landscape"
"portrait": "Retrato",
"landscape": "Paisagem"
},

"scan": {
Expand Down Expand Up @@ -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"
}
}
Loading

0 comments on commit 9d0c0af

Please sign in to comment.