diff --git a/.drone.yml b/.woodpecker/woodpecker.yml similarity index 55% rename from .drone.yml rename to .woodpecker/woodpecker.yml index fb3c076..3652369 100644 --- a/.drone.yml +++ b/.woodpecker/woodpecker.yml @@ -1,30 +1,20 @@ -kind: pipeline -type: docker -name: default - steps: - name: test + when: + event: [tag, push] image: maven:3-jdk-11 commands: - mvn -B -DskipTests clean package - mvn test -B volumes: - - name: m2 - path: /root/.m2 + - /home/docker/woodpecker/files/m2:/root/.m2 - name: archive-artifact + when: + event: [tag, push] image: alpine:latest commands: - mkdir -p /builds/mplayer4anime - cp target/mplayer4anime-*jar /builds/mplayer4anime/ volumes: - - name: builds - path: /builds - -volumes: - - name: m2 - host: - path: /home/docker/drone/files/m2 - - name: builds - host: - path: /home/www/builds \ No newline at end of file + - /home/www/builds:/builds diff --git a/Readme.md b/Readme.md index 1ba9a6c..6de026b 100644 --- a/Readme.md +++ b/Readme.md @@ -1,6 +1,6 @@ # mplayer4anime -![License](https://img.shields.io/badge/License-GPLv3-blue.svg) ![Releases](https://img.shields.io/github/downloads/developersu/mplayer4anime/total.svg) [![Build Status](https://ci.redrise.ru/api/badges/desu/mplayer4anime/status.svg)](https://ci.redrise.ru/desu/mplayer4anime) +![License](https://img.shields.io/badge/License-GPLv3-blue.svg) ![Releases](https://img.shields.io/github/downloads/developersu/mplayer4anime/total.svg) [![status-badge](https://ci.redrise.ru/api/badges/2/status.svg)](https://ci.redrise.ru/repos/2) mplayer4anime is mplayer launcher to play video file with audio layer and/or subtitles (.ass, .srt, etc.) at once. diff --git a/src/main/java/mplayer4anime/mpv/MpvProcess.java b/src/main/java/mplayer4anime/mpv/MpvProcess.java index d857859..94cad20 100644 --- a/src/main/java/mplayer4anime/mpv/MpvProcess.java +++ b/src/main/java/mplayer4anime/mpv/MpvProcess.java @@ -69,7 +69,7 @@ public class MpvProcess implements Runnable{ private boolean nonSupportedOs(){ if (! System.getProperty("os.name").toLowerCase().contains("linux")) { ServiceWindow.getErrorNotification("Error", - "Non-Linux OS are not supported. Yet. Please yse mplayer backend for now."); + "Non-Linux OS are not supported. Yet. Please use mplayer backend for now."); return true; } return false; diff --git a/src/main/java/mplayer4anime/ui/settings/SettingsWindow.java b/src/main/java/mplayer4anime/ui/settings/SettingsWindow.java index a1b0b99..faa42f8 100644 --- a/src/main/java/mplayer4anime/ui/settings/SettingsWindow.java +++ b/src/main/java/mplayer4anime/ui/settings/SettingsWindow.java @@ -37,13 +37,11 @@ public class SettingsWindow { stageAbout.setMinHeight(500); FXMLLoader loaderSettings = new FXMLLoader(getClass().getResource("/Settings/SettingsLayout.fxml")); - ResourceBundle resourceBundle; Locale userLocale = new Locale(Locale.getDefault().getISO3Language()); // NOTE: user locale based on ISO3 Language codes - resourceBundle = ResourceBundle.getBundle("locale", userLocale); + ResourceBundle resourceBundle = ResourceBundle.getBundle("locale", userLocale); loaderSettings.setResources(resourceBundle); - try { Parent parentAbout = loaderSettings.load();