Skip to content

Commit

Permalink
New Verison 1.9.1
Browse files Browse the repository at this point in the history
- PR #82 spanish translation (credit goes to @Deses)
- Changed to github-action to build the release
  • Loading branch information
OllisGit committed Nov 15, 2021
1 parent cae60d5 commit 39ca512
Show file tree
Hide file tree
Showing 9 changed files with 124 additions and 25 deletions.
78 changes: 78 additions & 0 deletions .github/workflows/github-release-actions.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
###
### Simple script to build a zip file of the whole repository
###
#
#script:
## debug - echo 'Hello World'
# - export PLUGIN_VERSION=$(cat setup.py | grep 'plugin_version = "*"' | cut -d '"' -f2)
# - zip -r master.zip * -i '\octoprint_*' 'translations' 'README.md' 'requirements.txt' 'setup.py'
## debug - ls -al
#
### see "Fix travis automatic build and deploy"
### https://github.com/oliexdev/openScale/pull/121
### https://github.com/oliexdev/openScale/pull/121/files
#before_deploy:
# - git tag -f travis-build
# - git remote add gh https://${TRAVIS_REPO_SLUG%/*}:${GITHUB_TOKEN}@github.com/${TRAVIS_REPO_SLUG}.git
# - git push -f gh travis-build
# - git remote remove gh
#
#deploy:
# name: "V${PLUGIN_VERSION}-draft"
# #prerelease: true
# draft: true
# provider: releases
# api_key: "${GITHUB_TOKEN}"
# file: "master.zip"
# overwrite: true
# skip_cleanup: true
# target_commitish: $TRAVIS_COMMIT



name: Build Plugin Release - Action
on: [push]
jobs:
Build-Release-ZIP-Action:
runs-on: ubuntu-latest
steps:
- name: Check out repository code
uses: actions/checkout@v2

- run: echo "Read current plugin version..."
- run: export PLUGIN_VERSION=$(cat setup.py | grep 'plugin_version = "*"' | cut -d '"' -f2)
- run: echo "Plugin Version $PLUGIN_VERSION ${PLUGIN_VERSION}"

- run: echo "Build ZIP"
- run: zip -r master.zip * -i '\octoprint_*' 'translations' 'README.md' 'requirements.txt' 'setup.py'
- name: List files in the repository
run: |
ls ${{ github.workspace }}
- name: version
run: echo "::set-output name=version::$(cat setup.py | grep 'plugin_version = "*"' | cut -d '"' -f2)"
id: version

- name: release
uses: actions/create-release@v1
id: create_release
env:
GITHUB_TOKEN: ${{ github.token }}
with:
draft: true
prerelease: false
release_name: V${{ steps.version.outputs.version }}-draft
tag_name: ${{ steps.version.outputs.version }}-draft
body_path: RELEASE_TEMPLATE.md

- name: upload master.zip to release
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ github.token }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: master.zip
asset_name: master.zip
asset_content_type: application/gzip

- run: echo "🍏 This job's status is ${{ job.status }}."
File renamed without changes.
15 changes: 15 additions & 0 deletions RELEASE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
## [BugFix]
- #xxx

## [Enhancement]
- #xxx

## Counter
![downloaded](https://img.shields.io/github/downloads/OllisGit/OctoPrint-FilamentManager/xxx/total)

## Support my Efforts

This plugin, as well as my [other plugins](https://github.com/OllisGit/) were developed in my spare time.
If you like it, I would be thankful about a cup of coffee :)

[![More coffee, more code](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=6SW5R6ZUKLB5E&source=url)
Binary file modified octoprint_filamentmanager/translations/es/LC_MESSAGES/messages.mo
Binary file not shown.
50 changes: 28 additions & 22 deletions octoprint_filamentmanager/translations/es/LC_MESSAGES/messages.po
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,15 @@
# This file is distributed under the same license as the
# OctoPrint-FilamentManager project.
# Ivan Garcia <[email protected]>, 2019.
# Carlos Romero <[email protected]>, 2021.
#
msgid ""
msgstr ""
"Project-Id-Version: OctoPrint-FilamentManager 0.5.2\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2021-10-17 11:30+0200\n"
"PO-Revision-Date: 2019-05-06 11:31+0100\n"
"Last-Translator: Ivan Garcia <ivan.garcia@studio-point.com>\n"
"PO-Revision-Date: 2021-10-18 12:35+0100\n"
"Last-Translator: Carlos Romero <deses12@gmail.com>\n"
"Language: es\n"
"Language-Team: es <[email protected]>\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
Expand Down Expand Up @@ -141,7 +142,7 @@ msgstr "¿Borrar bobina?"

#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:948
msgid "You are about to delete the filament spool <strong> - ()</strong>."
msgstr "Estás apunto de borrar la bobina de filamento <strong> - ()</strong>."
msgstr "Estás a punto de borrar la bobina de filamento <strong> - ()</strong>."

#: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:1020
msgid "Insufficient filament"
Expand All @@ -152,21 +153,21 @@ msgid ""
"The current print job needs more material than what's left on the "
"selected spool."
msgstr ""
"La impresión actual necesita mas filamento del que hay en la bobina "
"La impresión actual necesita más filamento del que hay en la bobina "
"seleccionada."

#: octoprint_filamentmanager/templates/settings.jinja2:4
#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:5
msgid "Plugin Configuration"
msgstr "Configuración del Plugin"
msgstr "Configuración del plugin"

#: octoprint_filamentmanager/templates/settings.jinja2:7
msgid "Filament Spools"
msgstr "Bobinas de filamento"

#: octoprint_filamentmanager/templates/settings.jinja2:13
msgid "Items per page"
msgstr "Objetos por página"
msgstr "Elementos por página"

#: octoprint_filamentmanager/templates/settings.jinja2:22
msgid "Sort by"
Expand All @@ -182,7 +183,7 @@ msgstr "Material (Ascendente)"

#: octoprint_filamentmanager/templates/settings.jinja2:25
msgid "Vendor (ascending)"
msgstr "Vendedor (Ascendente)"
msgstr "Fabricante (Ascendente)"

#: octoprint_filamentmanager/templates/settings.jinja2:26
msgid "Remaining (descending)"
Expand All @@ -201,7 +202,7 @@ msgstr "Material"
#: octoprint_filamentmanager/templates/settings.jinja2:38
#: octoprint_filamentmanager/templates/settings_profiledialog.jinja2:26
msgid "Vendor"
msgstr "Vendedor"
msgstr "Fabricante"

#: octoprint_filamentmanager/templates/settings.jinja2:39
#: octoprint_filamentmanager/templates/settings_spooldialog.jinja2:50
Expand Down Expand Up @@ -272,7 +273,7 @@ msgstr "Habilitar medición mediante software \"odometer\""

#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:50
msgid "Pause print if filament runs out"
msgstr "Pausar la impresión si el filamento se gasta"
msgstr "Pausar la impresión si el filamento se agota"

#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:56
msgid "Pause threshold"
Expand All @@ -289,6 +290,11 @@ msgid ""
"PostgreSQL-on-Raspbian-(Stretch)\" target=\"newTab\">wiki</a> how to "
"install the drivers and setup the database."
msgstr ""
"Si quieres usar una base de datos externa, por favor, mira mi <a "
"href=\"https://github.com/OllisGit/OctoPrint-FilamentManager/wiki/Setup-"
"PostgreSQL-on-Raspbian-(Stretch)\" target=\"newTab\">wiki</a> sobre como "
"instalar los drivers y configurar la base de datos."


#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:84
msgid "URI"
Expand All @@ -312,11 +318,11 @@ msgid ""
"instance for the changes to take affect."
msgstr ""
"Nota: Si cambias esta configuración deberás reiniciar la instancia de "
"OctoPrint para que los cambios hagan efecto."
"OctoPrint para que los cambios tengan efecto."

#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:122
msgid "Import & Export"
msgstr "Importar & Exportar"
msgstr "Importar y exportar"

#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:127
msgid "Browse..."
Expand All @@ -334,11 +340,11 @@ msgstr "Exportar"
msgid ""
"This does not look like a valid import archive. Only zip files are "
"supported."
msgstr "No parece un fichero de importación valido. Sólo se permiten archivos ZIP."
msgstr "No parece un fichero de importación válido. Sólo se permiten archivos zip."

#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:144
msgid "Currency symbol"
msgstr "Simbolo de moneda"
msgstr "Símbolo de moneda"

#: octoprint_filamentmanager/templates/settings_configdialog.jinja2:156
#: octoprint_filamentmanager/templates/settings_spooldialog.jinja2:87
Expand All @@ -354,11 +360,11 @@ msgstr "Guardar"

#: octoprint_filamentmanager/templates/settings_profiledialog.jinja2:5
msgid "Filament Profiles"
msgstr "Perfiles de Filamento"
msgstr "Perfiles de filamento"

#: octoprint_filamentmanager/templates/settings_profiledialog.jinja2:13
msgid "--- New Profile ---"
msgstr "--- Nuevo Perfil ---"
msgstr "--- Nuevo perfil ---"

#: octoprint_filamentmanager/templates/settings_profiledialog.jinja2:14
msgid "New"
Expand All @@ -370,7 +376,7 @@ msgstr "Guardar perfil"

#: octoprint_filamentmanager/templates/settings_profiledialog.jinja2:30
msgid "Vendor must be set"
msgstr "Debes escribir el vendedor"
msgstr "Debes escribir el fabricante"

#: octoprint_filamentmanager/templates/settings_profiledialog.jinja2:42
msgid "Material must be set"
Expand Down Expand Up @@ -406,11 +412,11 @@ msgstr "Precio"

#: octoprint_filamentmanager/templates/settings_spooldialog.jinja2:74
msgid "Temperature offset"
msgstr "Temperatura"
msgstr "Compensación de temperatura"

#: octoprint_filamentmanager/templates/sidebar.jinja2:3
msgid "hide overused usage"
msgstr ""
msgstr "Ocultar bobinas agotadas"

#: octoprint_filamentmanager/templates/sidebar.jinja2:10
#: octoprint_filamentmanager/templates/spool_confirmation.jinja2:18
Expand All @@ -420,7 +426,7 @@ msgstr "Extrusor"
#: octoprint_filamentmanager/templates/sidebar.jinja2:19
#: octoprint_filamentmanager/templates/spool_confirmation.jinja2:19
msgid "--- Select Spool ---"
msgstr "--- Seleccionar Bobina ---"
msgstr "--- Seleccionar bobina ---"

#: octoprint_filamentmanager/templates/spool_confirmation.jinja2:5
msgid "Confirm your selected spools"
Expand All @@ -433,7 +439,7 @@ msgid ""
"it's loaded correctly."
msgstr ""
"No hay información disponible sobre el extrusor de la impresión actual. "
"Asegúrate de que el proceso de análisis esté finalizado y se haya cargado"
"Asegúrate de que el proceso de análisis esté finalizado y haya cargado"
" correctamente."

#: octoprint_filamentmanager/templates/spool_confirmation.jinja2:14
Expand All @@ -442,6 +448,6 @@ msgid ""
"meant to protect you from accidentically selecting wrong spools for the "
"print."
msgstr ""
"Por favor, confirma las bobinas de los extrusores. Este dialogo está "
"preparado para evitar que elijas bobinas incorrectas de forma accidental."
"Por favor, confirma las bobinas seleccionadas para todos los extrusores activos. Este diálogo está "
"pensado para evitar que elijas bobinas incorrectas para esta impresión."

2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
plugin_identifier = "filamentmanager"
plugin_package = "octoprint_filamentmanager"
plugin_name = "OctoPrint-FilamentManager"
plugin_version = "1.9.0"
plugin_version = "1.9.1"
plugin_description = "Manage your spools and keep track of remaining filament on them"
plugin_author = "Sven Lohrmann, Olli"
plugin_author_email = "[email protected], [email protected]"
Expand Down
Binary file modified translations/es/LC_MESSAGES/messages.mo
Binary file not shown.
2 changes: 1 addition & 1 deletion translations/es/LC_MESSAGES/messages.po
Original file line number Diff line number Diff line change
Expand Up @@ -415,7 +415,7 @@ msgid "Temperature offset"
msgstr "Compensación de temperatura"

#: octoprint_filamentmanager/templates/sidebar.jinja2:3
msgid "Hide overused usage"
msgid "hide overused usage"
msgstr "Ocultar bobinas agotadas"

#: octoprint_filamentmanager/templates/sidebar.jinja2:10
Expand Down
2 changes: 1 addition & 1 deletion translations/messages.pot
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ msgid "Temperature offset"
msgstr ""

#: octoprint_filamentmanager/templates/sidebar.jinja2:3
msgid "Hide overused usage"
msgid "hide overused usage"
msgstr ""

#: octoprint_filamentmanager/templates/sidebar.jinja2:10
Expand Down

0 comments on commit 39ca512

Please sign in to comment.