Skip to content
Snippets Groups Projects
Verified Commit 6e709cdc authored by Eliot Berriot's avatar Eliot Berriot
Browse files

Removed non-breaking spaces and remaining gettext in templates

parent 2a9ca0a2
No related branches found
No related tags found
No related merge requests found
Showing
with 36 additions and 36 deletions
...@@ -1346,7 +1346,7 @@ Basic transcoding is now available to/from the following formats : ogg and mp3. ...@@ -1346,7 +1346,7 @@ Basic transcoding is now available to/from the following formats : ogg and mp3.
This relies internally on FFMPEG and can put some load on your server. This relies internally on FFMPEG and can put some load on your server.
It's definitely recommended you setup some caching for the transcoded files It's definitely recommended you setup some caching for the transcoded files
at your webserver level. Check the the exemple nginx file at deploy/nginx.conf at your webserver level. Check the the exemple nginx file at deploy/nginx.conf
for an implementation. for an implementation.
On the frontend, usage of transcoding should be transparent in the player. On the frontend, usage of transcoding should be transparent in the player.
......
...@@ -50,7 +50,7 @@ class Command(BaseCommand): ...@@ -50,7 +50,7 @@ class Command(BaseCommand):
self.stdout.write(self.style.SUCCESS(name)) self.stdout.write(self.style.SUCCESS(name))
self.stdout.write("") self.stdout.write("")
for line in script["help"].splitlines(): for line in script["help"].splitlines():
self.stdout.write(" {}".format(line)) self.stdout.write(" {}".format(line))
self.stdout.write("") self.stdout.write("")
def get_scripts(self): def get_scripts(self):
......
...@@ -13,7 +13,7 @@ from . import exceptions, utils ...@@ -13,7 +13,7 @@ from . import exceptions, utils
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
# the request Date should be between now - 30s and now + 30s # the request Date should be between now - 30s and now + 30s
DATE_HEADER_VALID_FOR = 30 DATE_HEADER_VALID_FOR = 30
......
...@@ -98,14 +98,14 @@ directory is mounted as a volume as well:: ...@@ -98,14 +98,14 @@ directory is mounted as a volume as well::
volumes: volumes:
- ./data/music:/music:ro - ./data/music:/music:ro
- ./data/media:/app/funkwhale_api/media - ./data/media:/app/funkwhale_api/media
# add your symlinked dirs here # add your symlinked dirs here
- /media/nfsshare:/media/nfsshare:ro - /media/nfsshare:/media/nfsshare:ro
api: api:
volumes: volumes:
- ./data/music:/music:ro - ./data/music:/music:ro
- ./data/media:/app/funkwhale_api/media - ./data/media:/app/funkwhale_api/media
# add your symlinked dirs here # add your symlinked dirs here
- /media/nfsshare:/media/nfsshare:ro - /media/nfsshare:/media/nfsshare:ro
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<input type="text" v-model="instanceUrl"> <input type="text" v-model="instanceUrl">
<button type="submit" class="ui button"><translate>Submit</translate></button> <button type="submit" class="ui button"><translate>Submit</translate></button>
</div> </div>
<p>{{ $gettext('Suggested choices') }}</p> <p><translate>Suggested choices</translate></p>
<div class="ui bulleted list"> <div class="ui bulleted list">
<div class="ui item" v-for="url in suggestedInstances"> <div class="ui item" v-for="url in suggestedInstances">
<a @click="instanceUrl = url">{{ url }}</a> <a @click="instanceUrl = url">{{ url }}</a>
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
<h4 v-translate class="ui header">Options</h4> <h4 v-translate class="ui header">Options</h4>
<div class="ui form"> <div class="ui form">
<div class="ui field"> <div class="ui field">
<label>{{ $gettext('Change language') }}</label> <label><translate>Change language</translate></label>
<select class="ui dropdown" v-model="$language.current"> <select class="ui dropdown" v-model="$language.current">
<option v-for="(language, key) in $language.available" :value="key">{{ language }}</option> <option v-for="(language, key) in $language.available" :value="key">{{ language }}</option>
</select> </select>
......
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
<tr> <tr>
<th></th> <th></th>
<th></th> <th></th>
<th colspan="6">{{ $gettext('Title') }}</th> <th colspan="6"><translate>Title</translate></th>
<th colspan="6">{{ $gettext('Artist') }}</th> <th colspan="6"><translate>Artist</translate></th>
<th colspan="6">{{ $gettext('Album') }}</th> <th colspan="6"><translate>Album</translate></th>
<th></th> <th></th>
</tr> </tr>
</thead> </thead>
...@@ -21,16 +21,16 @@ ...@@ -21,16 +21,16 @@
<tr> <tr>
<th colspan="3"> <th colspan="3">
<button @click="showDownloadModal = !showDownloadModal" class="ui basic button"> <button @click="showDownloadModal = !showDownloadModal" class="ui basic button">
{{ $gettext('Download') }} <translate>Download</translate>
</button> </button>
<modal :show.sync="showDownloadModal"> <modal :show.sync="showDownloadModal">
<div class="header">{{ $gettext('Download tracks') }}</div> <div class="header"><translate>Download tracks</translate></div>
<div class="content"> <div class="content">
<div class="description"> <div class="description">
<p>{{ $gettext('There is currently no way to download directly multiple tracks from funkwhale as a ZIP archive. However, you can use a command line tools such as cURL to easily download a list of tracks.') }}</p> <p><translate>There is currently no way to download directly multiple tracks from funkwhale as a ZIP archive. However, you can use a command line tools such as cURL to easily download a list of tracks.</translate></p>
{{ $gettext('Simply copy paste the snippet below into a terminal to launch the download.') }} <translate>Simply copy paste the snippet below into a terminal to launch the download.</translate>
<div class="ui warning message"> <div class="ui warning message">
{{ $gettext('Keep your PRIVATE_TOKEN secret as it gives access to your account.') }} <translate>Keep your PRIVATE_TOKEN secret as it gives access to your account.</translate>
</div> </div>
<pre> <pre>
export PRIVATE_TOKEN="{{ $store.state.auth.token }}" export PRIVATE_TOKEN="{{ $store.state.auth.token }}"
......
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
<div v-if="error" class="ui negative message"> <div v-if="error" class="ui negative message">
<div class="header"><translate>We cannot log you in</translate></div> <div class="header"><translate>We cannot log you in</translate></div>
<ul class="list"> <ul class="list">
<li v-if="error == 'invalid_credentials'">{{ $gettext('Please double-check your username/password couple is correct') }}</li> <li v-if="error == 'invalid_credentials'"><translate>Please double-check your username/password couple is correct</translate></li>
<li v-else>{{ $gettext('An unknown error happend, this can mean the server is down or cannot be reached') }}</li> <li v-else><translate>An unknown error happend, this can mean the server is down or cannot be reached</translate></li>
</ul> </ul>
</div> </div>
<div class="field"> <div class="field">
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
</div> </div>
<button tabindex="3" :class="['ui', {'loading': isLoading}, 'right', 'floated', 'green', 'button']" type="submit"> <button tabindex="3" :class="['ui', {'loading': isLoading}, 'right', 'floated', 'green', 'button']" type="submit">
{{ $gettext('Login') }} <translate>Login</translate>
</button> </button>
</form> </form>
</div> </div>
......
...@@ -48,12 +48,12 @@ ...@@ -48,12 +48,12 @@
</ul> </ul>
</div> </div>
<div class="field"> <div class="field">
<label>{{ $gettext('Old password') }}</label> <label><translate>Old password</translate></label>
<password-input required v-model="old_password" /> <password-input required v-model="old_password" />
</div> </div>
<div class="field"> <div class="field">
<label>{{ $gettext('New password') }}</label> <label><translate>New password</translate></label>
<password-input required v-model="new_password" /> <password-input required v-model="new_password" />
</div> </div>
<dangerous-button <dangerous-button
......
...@@ -19,10 +19,10 @@ ...@@ -19,10 +19,10 @@
<table v-if="result" class="ui very basic single line unstackable table"> <table v-if="result" class="ui very basic single line unstackable table">
<thead> <thead>
<tr> <tr>
<th>{{ $gettext('Actor') }}</th> <th><translate>Actor</translate></th>
<th>{{ $gettext('Creation date') }}</th> <th><translate>Creation date</translate></th>
<th>{{ $gettext('Status') }}</th> <th><translate>Status</translate></th>
<th>{{ $gettext('Actions') }}</th> <th><translate>Actions</translate></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
......
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
:class="['ui', 'positive', 'icon', {'disabled': !importBatch}, 'button']" :class="['ui', 'positive', 'icon', {'disabled': !importBatch}, 'button']"
:disabled="!importBatch" :disabled="!importBatch"
> >
{{ $gettext('Finish import' )}} <translate>Finish import</translate>
<i class="check icon"></i> <i class="check icon"></i>
</button> </button>
</div> </div>
......
...@@ -69,24 +69,24 @@ ...@@ -69,24 +69,24 @@
</td> </td>
<td> <td>
<span v-if="scope.obj.albums" :title="scope.obj.albums">{{ scope.obj.albums|truncate(30) }}</span> <span v-if="scope.obj.albums" :title="scope.obj.albums">{{ scope.obj.albums|truncate(30) }}</span>
<template v-else>{{ $gettext('N/A') }}</template> <template v-else><translate>N/A</translate></template>
</td> </td>
<td> <td>
<span v-if="scope.obj.comment" :title="scope.obj.comment">{{ scope.obj.comment|truncate(30) }}</span> <span v-if="scope.obj.comment" :title="scope.obj.comment">{{ scope.obj.comment|truncate(30) }}</span>
<template v-else>{{ $gettext('N/A') }}</template> <template v-else><translate>N/A</translate></template>
</td> </td>
<td> <td>
<human-date :date="scope.obj.creation_date"></human-date> <human-date :date="scope.obj.creation_date"></human-date>
</td> </td>
<td> <td>
<human-date v-if="scope.obj.imported_date" :date="scope.obj.creation_date"></human-date> <human-date v-if="scope.obj.imported_date" :date="scope.obj.creation_date"></human-date>
<template v-else>{{ $gettext('N/A') }}</template> <template v-else><translate>N/A</translate></template>
</td> </td>
<td> <td>
<router-link <router-link
class="ui tiny basic button" class="ui tiny basic button"
:to="{name: 'library.import.launch', query: {request: scope.obj.id}}" :to="{name: 'library.import.launch', query: {request: scope.obj.id}}"
v-if="scope.obj.status === 'pending'">{{ $gettext('Create import') }}</router-link> v-if="scope.obj.status === 'pending'"><translate>Create import</translate></router-link>
</td> </td>
</template> </template>
</action-table> </action-table>
......
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
</template> </template>
<template slot="row-cells" slot-scope="scope"> <template slot="row-cells" slot-scope="scope">
<td> <td>
<router-link :to="{name: 'manage.users.users.detail', params: {id: scope.obj.id }}">{{ scope.obj.owner.username }}</router-link> <router-link :to="{name: 'manage.users.users.detail', params: {id: scope.obj.id }}">{{ scope.obj.owner.username }}</router-link>
</td> </td>
<td> <td>
<span v-if="scope.obj.users.length > 0" class="ui green basic label"><translate>Used</translate></span> <span v-if="scope.obj.users.length > 0" class="ui green basic label"><translate>Used</translate></span>
......
...@@ -45,14 +45,14 @@ ...@@ -45,14 +45,14 @@
</template> </template>
<template slot="row-cells" slot-scope="scope"> <template slot="row-cells" slot-scope="scope">
<td> <td>
<router-link :to="{name: 'manage.users.users.detail', params: {id: scope.obj.id }}">{{ scope.obj.username }}</router-link> <router-link :to="{name: 'manage.users.users.detail', params: {id: scope.obj.id }}">{{ scope.obj.username }}</router-link>
</td> </td>
<td> <td>
<span>{{ scope.obj.email }}</span> <span>{{ scope.obj.email }}</span>
</td> </td>
<td> <td>
<span v-if="scope.obj.is_active" class="ui basic green label">{{ $gettext('Active') }}</span> <span v-if="scope.obj.is_active" class="ui basic green label"><translate>Active</translate></span>
<span v-else class="ui basic grey label">{{ $gettext('Inactive') }}</span> <span v-else class="ui basic grey label"><translate>Inactive</translate></span>
</td> </td>
<td> <td>
<human-date :date="scope.obj.date_joined"></human-date> <human-date :date="scope.obj.date_joined"></human-date>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment