Added a new transcoding mode: transcode if and only if the format is not handled by the browser. Made the subsonic API configurable again in conf file. Moved the subsonic's artist list mode in the per-user settings page. fixes #46
This commit is contained in:
emeric
@@ -1,40 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<messages xmlns:if="Wt.WTemplate.conditions">
|
||||
<!--FORMS message blocks-->
|
||||
|
||||
<message id="Lms.Admin.Subsonic.template">
|
||||
<legend>${tr:Lms.Admin.Subsonic.subsonic}</legend>
|
||||
<div class="form-horizontal">
|
||||
|
||||
<div class="form-group">
|
||||
<label class="control-label col-sm-2" for="${id:enable}">
|
||||
${tr:Lms.Admin.Subsonic.enable-api}
|
||||
</label>
|
||||
<div class="col-sm-5">
|
||||
<div class="checkbox"><label>${enable}</label></div>
|
||||
</div>
|
||||
<div class="help-block col-sm-5">
|
||||
${enable-info}
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="control-label col-sm-2" for="${id:artist-list-mode}">
|
||||
${tr:Lms.Admin.Subsonic.artist-list-mode}
|
||||
</label>
|
||||
<div class="col-sm-5">
|
||||
${artist-list-mode}
|
||||
</div>
|
||||
<div class="help-block col-sm-5">
|
||||
${artist-list-mode-info}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<div class="col-sm-offset-2 col-sm-10">
|
||||
${apply-btn class="btn-primary"} ${discard-btn}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</message>
|
||||
|
||||
</messages>
|
||||
@@ -42,21 +42,6 @@
|
||||
${password-info}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label class="control-label col-sm-2" for="${id:audio-transcode-bitrate-limit}">
|
||||
${tr:Lms.Admin.User.audio-transcode-bitrate-limit}
|
||||
</label>
|
||||
<div class="col-sm-5">
|
||||
<div class="input-group">
|
||||
${audio-transcode-bitrate-limit}
|
||||
<span class="input-group-addon">kbps</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="help-block col-sm-5">
|
||||
${audio-transcode-bitrate-limit-info}
|
||||
</div>
|
||||
</div>
|
||||
${<if-demo>}
|
||||
<div class="form-group">
|
||||
<label class="control-label col-sm-2" for="${id:demo}">
|
||||
|
||||
+18
-17
@@ -68,14 +68,6 @@
|
||||
<message id="Lms.Admin.Database.Status.status-scheduled">Scheduled on {1}</message>
|
||||
<message id="Lms.Admin.Database.Status.status-in-progress">Scanning {1} of {2} files ({3} %)</message>
|
||||
|
||||
<!--Subsonic-->
|
||||
<message id="Lms.Admin.Subsonic.all-artists">All artists</message>
|
||||
<message id="Lms.Admin.Subsonic.release-artists">Album artists</message>
|
||||
<message id="Lms.Admin.Subsonic.enable-api">Enable</message>
|
||||
<message id="Lms.Admin.Subsonic.artist-list-mode">Artist list mode</message>
|
||||
<message id="Lms.Admin.Subsonic.need-restart">You must restart the service for this change to take effect</message>
|
||||
<message id="Lms.Admin.Subsonic.subsonic">Subsonic API</message>
|
||||
|
||||
<!--Users-->
|
||||
<message id="Lms.Admin.Users.add">New user</message>
|
||||
<message id="Lms.Admin.Users.admin">Admin</message>
|
||||
@@ -166,20 +158,29 @@
|
||||
<!--Settings-->
|
||||
<message id="Lms.Settings.appearance">Appearance</message>
|
||||
<message id="Lms.Settings.audio">Audio</message>
|
||||
<message id="Lms.Settings.audio-settings-are-local">These audio settings are local to your browser!</message>
|
||||
<message id="Lms.Settings.change-password">Change password</message>
|
||||
<message id="Lms.Settings.dark-mode">Dark mode</message>
|
||||
<message id="Lms.Settings.demo-cannot-save">Cannot save using a demo account!</message>
|
||||
<message id="Lms.Settings.password-bad">Bad password</message>
|
||||
<message id="Lms.Settings.password-must-fill-old-password">Old password must be filled in</message>
|
||||
<message id="Lms.Settings.transcoding">Transcoding</message>
|
||||
<message id="Lms.Settings.transcoding-bitrate">Transcode bitrate</message>
|
||||
<message id="Lms.Settings.transcoding-format">Transcode format</message>
|
||||
<message id="Lms.Settings.transcoding-enable">Enable transcoding</message>
|
||||
<message id="Lms.Settings.transcoding.matroska_opus">Matroska/Opus</message>
|
||||
<message id="Lms.Settings.transcoding.mp3">MP3</message>
|
||||
<message id="Lms.Settings.transcoding.ogg_opus">Ogg/Opus</message>
|
||||
<message id="Lms.Settings.transcoding.ogg_vorbis">Ogg/Vorbis</message>
|
||||
<message id="Lms.Settings.transcoding.webm_vorbis">WebM/Vorbis</message>
|
||||
<message id="Lms.Settings.subsonic-artist-list-mode">Artist list mode</message>
|
||||
<message id="Lms.Settings.subsonic-artist-list-mode.all-artists">All artists</message>
|
||||
<message id="Lms.Settings.subsonic-artist-list-mode.release-artists">Album artists</message>
|
||||
<message id="Lms.Settings.subsonic-api">Subsonic API</message>
|
||||
<message id="Lms.Settings.transcode">Transcoding</message>
|
||||
<message id="Lms.Settings.transcode-bitrate">Transcode bitrate</message>
|
||||
<message id="Lms.Settings.transcode-enable">Enable transcoding</message>
|
||||
<message id="Lms.Settings.transcode-format">Transcode format</message>
|
||||
<message id="Lms.Settings.transcode-format.matroska_opus">Matroska/Opus</message>
|
||||
<message id="Lms.Settings.transcode-format.mp3">MP3</message>
|
||||
<message id="Lms.Settings.transcode-format.ogg_opus">Ogg/Opus</message>
|
||||
<message id="Lms.Settings.transcode-format.ogg_vorbis">Ogg/Vorbis</message>
|
||||
<message id="Lms.Settings.transcode-format.webm_vorbis">WebM/Vorbis</message>
|
||||
<message id="Lms.Settings.transcode-mode">Enable transcoding</message>
|
||||
<message id="Lms.Settings.transcode-mode.always">Always</message>
|
||||
<message id="Lms.Settings.transcode-mode.if-format-not-supported">Only when format is not supported</message>
|
||||
<message id="Lms.Settings.transcode-mode.never">Never</message>
|
||||
<message id="Lms.Settings.settings">Settings</message>
|
||||
<message id="Lms.Settings.settings-saved">New settings saved!</message>
|
||||
|
||||
|
||||
+20
-19
@@ -68,14 +68,6 @@
|
||||
<message id="Lms.Admin.Database.Status.status-scheduled">Planifié le {1}</message>
|
||||
<message id="Lms.Admin.Database.Status.status-in-progress">Scan de {1} fichiers sur {2} ({3} %)</message>
|
||||
|
||||
<!--Subsonic-->
|
||||
<message id="Lms.Admin.Subsonic.all-artists">Tous les artistes</message>
|
||||
<message id="Lms.Admin.Subsonic.release-artists">Artistes d'album</message>
|
||||
<message id="Lms.Admin.Subsonic.enable-api">Activer</message>
|
||||
<message id="Lms.Admin.Subsonic.artist-list-mode">Mode de listage des artistes</message>
|
||||
<message id="Lms.Admin.Subsonic.need-restart">Vous devez redémarrer le service pour que cette option soit prise en compte</message>
|
||||
<message id="Lms.Admin.Subsonic.subsonic">API Subsonic</message>
|
||||
|
||||
<!--Users-->
|
||||
<message id="Lms.Admin.Users.add">Ajouter</message>
|
||||
<message id="Lms.Admin.Users.admin">Admin</message>
|
||||
@@ -146,11 +138,11 @@
|
||||
<!--Playqueue-->
|
||||
<message id="Lms.PlayQueue.clear">Effacer</message>
|
||||
<message id="Lms.PlayQueue.nb-tracks">{1} pistes</message>
|
||||
<message id="Lms.PlayQueue.nb-tracks-playing">
|
||||
<message id="Lms.PlayQueue.nb-tracks-added">
|
||||
<plural case="0">{1} piste ajoutée</plural>
|
||||
<plural case="1">{1} pistes ajoutées</plural>
|
||||
</message>
|
||||
<message id="Lms.PlayQueue.nb-tracks-added">
|
||||
<message id="Lms.PlayQueue.nb-tracks-playing">
|
||||
<plural case="0">{1} piste ajoutée</plural>
|
||||
<plural case="1">{1} pistes ajoutées</plural>
|
||||
</message>
|
||||
@@ -166,20 +158,29 @@
|
||||
<!--Settings-->
|
||||
<message id="Lms.Settings.appearance">Apparence</message>
|
||||
<message id="Lms.Settings.audio">Audio</message>
|
||||
<message id="Lms.Settings.audio-settings-are-local">Ces paramètres audio sont locaux à votre navigateur !</message>
|
||||
<message id="Lms.Settings.change-password">Changement de mot de passe</message>
|
||||
<message id="Lms.Settings.dark-mode">Mode sombre</message>
|
||||
<message id="Lms.Settings.demo-cannot-save">Impossible de sauvegarder en utilisant un compte de démo !</message>
|
||||
<message id="Lms.Settings.password-bad">Mauvais mot de passe</message>
|
||||
<message id="Lms.Settings.password-must-fill-old-password">L'ancien mot de passe doit être renseigné</message>
|
||||
<message id="Lms.Settings.transcoding">Transcodage</message>
|
||||
<message id="Lms.Settings.transcoding-bitrate">Bitrate du transcodage</message>
|
||||
<message id="Lms.Settings.transcoding-format">Format du transcodage</message>
|
||||
<message id="Lms.Settings.transcoding-enable">Activer le transcodage</message>
|
||||
<message id="Lms.Settings.transcoding.matroska_opus">Matroska/Opus</message>
|
||||
<message id="Lms.Settings.transcoding.mp3">MP3</message>
|
||||
<message id="Lms.Settings.transcoding.ogg_opus">Ogg/Opus</message>
|
||||
<message id="Lms.Settings.transcoding.ogg_vorbis">Ogg/Vorbis</message>
|
||||
<message id="Lms.Settings.transcoding.webm_vorbis">WebM/Vorbis</message>
|
||||
<message id="Lms.Settings.subsonic-artist-list-mode">Mode de listage des artistes</message>
|
||||
<message id="Lms.Settings.subsonic-artist-list-mode.all-artists">Tous les artistes</message>
|
||||
<message id="Lms.Settings.subsonic-artist-list-mode.release-artists">Tous les artistes d'album</message>
|
||||
<message id="Lms.Settings.subsonic-api">API Subsonic</message>
|
||||
<message id="Lms.Settings.transcode">Transcodage</message>
|
||||
<message id="Lms.Settings.transcode-bitrate">Bitrate du transcodage</message>
|
||||
<message id="Lms.Settings.transcode-enable">Activer le transcodage</message>
|
||||
<message id="Lms.Settings.transcode-format">Format du transcodage</message>
|
||||
<message id="Lms.Settings.transcode-format.matroska_opus">Matroska/Opus</message>
|
||||
<message id="Lms.Settings.transcode-format.mp3">MP3</message>
|
||||
<message id="Lms.Settings.transcode-format.ogg_opus">Ogg/Opus</message>
|
||||
<message id="Lms.Settings.transcode-format.ogg_vorbis">Ogg/Vorbis</message>
|
||||
<message id="Lms.Settings.transcode-format.webm_vorbis">WebM/Vorbis</message>
|
||||
<message id="Lms.Settings.transcode-mode">Appliquer le transcodage</message>
|
||||
<message id="Lms.Settings.transcode-mode.always">Toujours</message>
|
||||
<message id="Lms.Settings.transcode-mode.if-format-not-supported">Seulement lorsque le format n'est pas pris en charge</message>
|
||||
<message id="Lms.Settings.transcode-mode.never">Jamais</message>
|
||||
<message id="Lms.Settings.settings">Paramètres</message>
|
||||
<message id="Lms.Settings.settings-saved">Paramètres sauvegardés !</message>
|
||||
|
||||
|
||||
+73
-12
@@ -19,44 +19,105 @@
|
||||
</div>
|
||||
</div>
|
||||
<legend>${tr:Lms.Settings.audio}</legend>
|
||||
<div class="col-sm-12">
|
||||
<div class="row">
|
||||
<div class="alert alert-info col-sm-7">
|
||||
${tr:Lms.Settings.audio-settings-are-local}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-horizontal">
|
||||
<div class="form-group">
|
||||
<label class="col-sm-2 control-label" for="${id:transcoding-enable}">
|
||||
${tr:Lms.Settings.transcoding-enable}
|
||||
<label class="col-sm-2 control-label" for="${id:transcode-mode}">
|
||||
${tr:Lms.Settings.transcode-mode}
|
||||
</label>
|
||||
<div class="col-sm-5">
|
||||
<div class="checkbox"><label>${transcoding-enable}</label></div>
|
||||
${transcode-mode}
|
||||
</div>
|
||||
<div class="col-sm-5 help-block">
|
||||
${transcoding-enable-info}
|
||||
${transcode-mode-info}
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="control-label col-sm-2" for="${id:transcoding-format}">
|
||||
${tr:Lms.Settings.transcoding-format}
|
||||
<label class="control-label col-sm-2" for="${id:transcode-format}">
|
||||
${tr:Lms.Settings.transcode-format}
|
||||
</label>
|
||||
<div class="col-sm-5">
|
||||
${transcoding-format}
|
||||
${transcode-format}
|
||||
</div>
|
||||
<div class="help-block col-sm-5">
|
||||
${transcoding-format-info}
|
||||
${transcode-format-info}
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="control-label col-sm-2" for="${id:transcoding-bitrate}">
|
||||
${tr:Lms.Settings.transcoding-bitrate}
|
||||
<label class="control-label col-sm-2" for="${id:transcode-bitrate}">
|
||||
${tr:Lms.Settings.transcode-bitrate}
|
||||
</label>
|
||||
<div class="col-sm-5">
|
||||
<div class="input-group">
|
||||
${transcoding-bitrate}
|
||||
${transcode-bitrate}
|
||||
<span class="input-group-addon">kbps</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="help-block col-sm-5">
|
||||
${transcoding-bitrate-info}
|
||||
${transcode-bitrate-info}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
${<if-has-subsonic-api>}
|
||||
<legend>${tr:Lms.Settings.subsonic-api}</legend>
|
||||
<div class="form-horizontal">
|
||||
|
||||
<div class="form-group">
|
||||
<label class="col-sm-2 control-label" for="${id:subsonic-transcode-enable}">
|
||||
${tr:Lms.Settings.transcode-enable}
|
||||
</label>
|
||||
<div class="col-sm-5">
|
||||
<div class="checkbox"><label>${subsonic-transcode-enable}</label></div>
|
||||
</div>
|
||||
<div class="col-sm-5 help-block">
|
||||
${subsonic-transcode-enable-info}
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="control-label col-sm-2" for="${id:subsonic-transcode-format}">
|
||||
${tr:Lms.Settings.transcode-format}
|
||||
</label>
|
||||
<div class="col-sm-5">
|
||||
${subsonic-transcode-format}
|
||||
</div>
|
||||
<div class="col-sm-5 help-block">
|
||||
${subsonic-transcode-format-info}
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="control-label col-sm-2" for="${id:subsonic-transcode-bitrate}">
|
||||
${tr:Lms.Settings.transcode-bitrate}
|
||||
</label>
|
||||
<div class="col-sm-5">
|
||||
<div class="input-group">
|
||||
${subsonic-transcode-bitrate}
|
||||
<span class="input-group-addon">kbps</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="help-block col-sm-5">
|
||||
${subsonic-transcode-bitrate-info}
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="control-label col-sm-2" for="${id:subsonic-artist-list-mode}">
|
||||
${tr:Lms.Settings.subsonic-artist-list-mode}
|
||||
</label>
|
||||
<div class="col-sm-5">
|
||||
${subsonic-artist-list-mode}
|
||||
</div>
|
||||
<div class="help-block col-sm-5">
|
||||
${subsonic-artist-list-mode-info}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
${</if-has-subsonic-api>}
|
||||
<legend>${tr:Lms.Settings.change-password}</legend>
|
||||
<div class="form-horizontal">
|
||||
${<if-has-old-password>}
|
||||
|
||||
Reference in New Issue
Block a user