Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
funkwhale
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Alexandra Dupouy
funkwhale
Commits
32ccea92
Verified
Commit
32ccea92
authored
Oct 05, 2018
by
Agate
💬
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
See #559: Fixed untranslated privacy settings
parent
2845bdd9
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
25 additions
and
19 deletions
+25
-19
front/src/components/activity/Like.vue
front/src/components/activity/Like.vue
+4
-2
front/src/components/activity/Listen.vue
front/src/components/activity/Listen.vue
+4
-2
front/src/components/auth/Settings.vue
front/src/components/auth/Settings.vue
+7
-15
front/src/components/mixins/Translations.vue
front/src/components/mixins/Translations.vue
+10
-0
No files found.
front/src/components/activity/Like.vue
View file @
32ccea92
...
...
@@ -9,8 +9,10 @@
<human-date
class=
"date"
:date=
"event.published"
/>
</div>
<div
class=
"extra text"
>
<router-link
:to=
"
{name: 'library.tracks.detail', params: {id: event.object.local_id }}">
{{
event
.
object
.
name
}}
</router-link>
<translate
:translate-params=
"
{album: event.object.album, artist: event.object.artist}">from %{ album } by %{ artist }
</translate>
<router-link
:to=
"
{name: 'library.tracks.detail', params: {id: event.object.local_id }}">
{{
event
.
object
.
name
}}
</router-link>
<translate
:translate-params=
"
{album: event.object.album, artist: event.object.artist}">from %{ album } by %{ artist }
</translate>
</div>
</div>
</div>
...
...
front/src/components/activity/Listen.vue
View file @
32ccea92
...
...
@@ -9,8 +9,10 @@
<human-date
class=
"date"
:date=
"event.published"
/>
</div>
<div
class=
"extra text"
>
<router-link
:to=
"
{name: 'library.tracks.detail', params: {id: event.object.local_id }}">
{{
event
.
object
.
name
}}
</router-link>
<translate
:translate-params=
"
{album: event.object.album, artist: event.object.artist}">from %{ album } by %{ artist }
</translate>
<router-link
:to=
"
{name: 'library.tracks.detail', params: {id: event.object.local_id }}">
{{
event
.
object
.
name
}}
</router-link>
<translate
:translate-params=
"
{album: event.object.album, artist: event.object.artist}">from %{ album } by %{ artist }
</translate>
</div>
</div>
</div>
...
...
front/src/components/auth/Settings.vue
View file @
32ccea92
...
...
@@ -18,10 +18,10 @@
</ul>
</div>
<div
class=
"field"
v-for=
"f in orderedSettingsFields"
>
<label
:for=
"f.id"
>
{{
f
.
label
}}
</label>
<p
v-if=
"f.help"
>
{{
f
.
help
}}
</p>
<label
>
{{
sharedLabels
.
fields
[
f
.
id
]
.
label
}}
</label>
<p
v-if=
"f.help"
>
{{
sharedLabels
.
fields
[
f
.
id
]
.
help
}}
</p>
<select
v-if=
"f.type === 'dropdown'"
class=
"ui dropdown"
v-model=
"f.value"
>
<option
:value=
"c
.value"
v-for=
"c in f.choices"
>
{{
c
.
label
}}
</option>
<option
:value=
"c
"
v-for=
"c in f.choices"
>
{{
sharedLabels
.
fields
[
f
.
id
].
choices
[
c
]
}}
</option>
</select>
</div>
<button
:class=
"['ui',
{'loading': isLoading}, 'button']" type="submit">
...
...
@@ -118,8 +118,10 @@ import axios from 'axios'
import
logger
from
'
@/logging
'
import
PasswordInput
from
'
@/components/forms/PasswordInput
'
import
SubsonicTokenForm
from
'
@/components/auth/SubsonicTokenForm
'
import
TranslationsMixin
from
'
@/components/mixins/Translations
'
export
default
{
mixins
:
[
TranslationsMixin
],
components
:
{
PasswordInput
,
SubsonicTokenForm
...
...
@@ -144,24 +146,14 @@ export default {
'
privacy_level
'
:
{
type
:
'
dropdown
'
,
initial
:
this
.
$store
.
state
.
auth
.
profile
.
privacy_level
,
label
:
'
Activity visibility
'
,
help
:
'
Determine the visibility level of your activity
'
,
choices
:
[
{
value
:
'
me
'
,
label
:
'
Nobody except me
'
},
{
value
:
'
instance
'
,
label
:
'
Everyone on this instance
'
}
]
choices
:
[
'
me
'
,
'
instance
'
]
}
}
}
}
d
.
settings
.
order
.
forEach
(
id
=>
{
d
.
settings
.
fields
[
id
].
value
=
d
.
settings
.
fields
[
id
].
initial
d
.
settings
.
fields
[
id
].
id
=
id
})
return
d
},
...
...
front/src/components/mixins/Translations.vue
View file @
32ccea92
...
...
@@ -3,6 +3,16 @@ export default {
computed
:
{
sharedLabels
()
{
return
{
fields
:
{
privacy_level
:
{
label
:
this
.
$gettext
(
'
Activity visibility
'
),
help
:
this
.
$gettext
(
'
Determine the visibility level of your activity
'
),
choices
:
{
me
:
this
.
$gettext
(
'
Nobody except me
'
),
instance
:
this
.
$gettext
(
'
Everyone on this instance
'
),
}
}
},
filters
:
{
creation_date
:
this
.
$gettext
(
'
Creation date
'
),
accessed_date
:
this
.
$gettext
(
'
Accessed date
'
),
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment