okseby/orchard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'main' of https://github.com/ciderapp/Cider

Browse source
This commit is contained in:
vapormusic 2022-06-04 08:26:55 +07:00
commit e2c71c8720
3 changed files with 26 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.circleci/config.yml
View file

@ -160,8 +160,8 @@ jobs:
# name: Fix Versioning and Add Channel # name: Fix Versioning and Add Channel
# command: yarn circle:script # command: yarn circle:script
- run: - run:
name: Set App Version name: Update Version Number of App
command: echo "export APP_VERSION=$(grep '"version":.*' package.json | cut -d '"' -f 16 | head -1)" >> $BASH_ENV command: sudo chmod +x resources/version.sh && ./resources/version.sh || true
- run: - run:
name: Publish Release name: Publish Release
command: | command: |

4
resources/version.sh
View file

@ -3,7 +3,7 @@
LATEST_SHA=$(curl -s https://api.github.com/repos/ciderapp/Cider/branches/stable | grep sha | cut -d '"' -f 4 | sed 's/v//' | xargs) LATEST_SHA=$(curl -s https://api.github.com/repos/ciderapp/Cider/branches/stable | grep sha | cut -d '"' -f 4 | sed 's/v//' | xargs)
COMMITSINCESTABLE=$(git rev-list $LATEST_SHA..HEAD --count) COMMITSINCESTABLE=$(git rev-list $LATEST_SHA..HEAD --count)
CURRENT_VERSION=$(node -p -e "require('./package.json').version") CURRENT_VERSION=$(node -p -e "require('./package.json').version")
NEW_VERSION=${CURRENT_VERSION/-/.}.$COMMITSINCESTABLE NEW_VERSION=${CURRENT_VERSION/0/$COMMITSINCESTABLE}
if [[ $COMMITSINCESTABLE -gt 0 ]] if [[ $COMMITSINCESTABLE -gt 0 ]]
then then
echo "Version: $NEW_VERSION" echo "Version: $NEW_VERSION"
@ -12,4 +12,4 @@ else
echo "Version unchanged, commits since stable is 0" echo "Version unchanged, commits since stable is 0"
fi fi
echo "export APP_VERSION=$(node -p -e 'require("./package.json").version')" >> $BASH_ENV

29
src/i18n/de_DE.json
View file

@ -113,7 +113,7 @@
"term.contributors": "Mithelfer", "term.contributors": "Mithelfer",
"term.equalizer": "Equalizer", "term.equalizer": "Equalizer",
"term.reset": "Zurücksetzen", "term.reset": "Zurücksetzen",
"term.tracks": "Lieder", "term.tracks": "Titel",
"term.videos": "Videos", "term.videos": "Videos",
"term.menu": "Menü", "term.menu": "Menü",
"term.check": "Nach Updates suchen", "term.check": "Nach Updates suchen",
@ -179,8 +179,8 @@
"action.unfollow": "Entfolgen", "action.unfollow": "Entfolgen",
"action.unfollow.success": "Entfolgt", "action.unfollow.success": "Entfolgt",
"action.unfollow.error": "Fehler beim Entfolgen", "action.unfollow.error": "Fehler beim Entfolgen",
"action.playNext": "Spiele als Nächstes", "action.playNext": "Nächster Titel",
"action.playLater": "Spiele später", "action.playLater": "Zuletzt wiedergeben",
"action.startRadio": "Starte Radio", "action.startRadio": "Starte Radio",
"action.goToArtist": "Gehe zu Künstler", "action.goToArtist": "Gehe zu Künstler",
"action.goToAlbum": "Gehe zu Album", "action.goToAlbum": "Gehe zu Album",
@ -192,9 +192,9 @@
"action.dislike": "Dislike", "action.dislike": "Dislike",
"action.undoDislike": "Dislike entfernen", "action.undoDislike": "Dislike entfernen",
"action.showWebRemoteQR": "Web-Remote", "action.showWebRemoteQR": "Web-Remote",
"action.playTracksNext": "Spiele ${app.selectedMediaItems.length} Lieder als Nächstes", "action.playTracksNext": "Spiele ${app.selectedMediaItems.length} Titel als Nächstes",
"action.playTracksLater": "Spiele ${app.selectedMediaItems.length} Lieder später", "action.playTracksLater": "Spiele ${app.selectedMediaItems.length} Titel später",
"action.removeTracks": "Entferne ${self.selectedItems.length} Lieder aus der Warteschlange", "action.removeTracks": "Entferne ${self.selectedItems.length} Titel aus der Warteschlange",
"action.import": "Importieren", "action.import": "Importieren",
"action.export": "Exportieren", "action.export": "Exportieren",
"action.showAlbum": "Ganzes Album anzeigen", "action.showAlbum": "Ganzes Album anzeigen",
@ -371,5 +371,20 @@
"settings.option.visual.theme.github.openfolder": "Öffne Themes Ordner", "settings.option.visual.theme.github.openfolder": "Öffne Themes Ordner",
"settings.option.debug.copy_log": "Logs in die Zwischenablage kopieren", "settings.option.debug.copy_log": "Logs in die Zwischenablage kopieren",
"settings.header.visual.theme.github.page": "Themes von GitHub", "settings.header.visual.theme.github.page": "Themes von GitHub",
"settings.header.visual.plugin.github.page": "Plugins von GitHub" "settings.header.visual.plugin.github.page": "Plugins von GitHub",
"settings.option.connectivity.discordRPC.reload": "DiscordRPC neu laden",
"menubar.options.reload": "Neu laden",
"settings.option.general.customizeSidebar": "Seitenleistenelemente anpassen",
"settings.option.general.customizeSidebar.customize": "Anpassen",
"settings.header.window": "Fenster",
"settings.option.visual.theme.github.available": "Verfügbar",
"settings.option.visual.theme.github.applied": "Angewandt",
"action.createNew": "Erstellen...",
"settings.option.connect.link_account": "Synchronisierung mit Cider Connect aktivieren",
"settings.option.connect.link_account.description": "Wenn du deinen Discord-Account mit Cider Connect verknüpfst, kannst du Benutzerdaten speichern, einschließlich Einstellungen, EQs und eventuell mehr, sobald es fertig ist. (Work in Progress)",
"action.editTracklist": "Playlist bearbeiten",
"term.track": {
"one": "Titel",
"other": "Titel"
}
} }