Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Julien Veyssier
funkwhale
Commits
b4b481cf
Commit
b4b481cf
authored
Apr 19, 2018
by
Baptiste Gelez
Browse files
Merge branch 'i18n-requests' into 'develop'
i18n: requests See merge request
funkwhale/funkwhale!139
parents
619e18a5
03208725
Changes
3
Hide whitespace changes
Inline
Side-by-side
front/src/components/requests/Card.vue
View file @
b4b481cf
...
...
@@ -23,7 +23,7 @@
<button
@
click=
"createImport"
v-if=
"request.status === 'pending' && importAction && $store.state.auth.availablePermissions['import.launch']"
class=
"ui mini basic green right floated button"
>
Create import
</button>
class=
"ui mini basic green right floated button"
>
{{
$t
(
'
Create import
'
)
}}
</button>
</div>
</div>
...
...
front/src/components/requests/Form.vue
View file @
b4b481cf
<
template
>
<div>
<form
v-if=
"!over"
class=
"ui form"
@
submit.prevent=
"submit"
>
<p>
Something's missing in the library? Let us know what you would like to listen!
</p>
<p>
{{
$t
(
'
Something
\
'
s missing in the library? Let us know what you would like to listen!
'
)
}}
</p>
<div
class=
"required field"
>
<label>
Artist name
</label>
<label>
{{
$t
(
'
Artist name
'
)
}}
</label>
<input
v-model=
"currentArtistName"
placeholder=
"The Beatles, Mickael Jackson…"
required
maxlength=
"200"
>
</div>
<div
class=
"field"
>
<label>
Albums
</label>
<p>
Leave this field empty if you're requesting the whole discography.
</p>
<label>
{{
$t
(
'
Albums
'
)
}}
</label>
<p>
{{
$t
(
'
Leave this field empty if you
\
'
re requesting the whole discography.
'
)
}}
</p>
<input
v-model=
"currentAlbums"
placeholder=
"The White Album, Thriller…"
maxlength=
"2000"
>
</div>
<div
class=
"field"
>
<label>
Comment
</label>
<label>
{{
$t
(
'
Comment
'
)
}}
</label>
<textarea
v-model=
"currentComment"
rows=
"3"
placeholder=
"Use this comment box to add details to your request if needed"
maxlength=
"2000"
></textarea>
</div>
<button
class=
"ui submit button"
type=
"submit"
>
Submit
</button>
<button
class=
"ui submit button"
type=
"submit"
>
{{
$t
(
'
Submit
'
)
}}
</button>
</form>
<div
v-else
class=
"ui success message"
>
<div
class=
"header"
>
Request submitted!
</div>
<p>
We've received your request, you'll get some groove soon ;)
</p>
<button
@
click=
"reset"
class=
"ui button"
>
Submit another request
</button>
<p>
{{
$t
(
'
We
\
'
ve received your request, you
\
'
ll get some groove soon ;)
'
)
}}
</p>
<button
@
click=
"reset"
class=
"ui button"
>
{{
$t
(
'
Submit another request
'
)
}}
</button>
</div>
<div
v-if=
"requests.length > 0"
>
<div
class=
"ui divider"
></div>
<h3
class=
"ui header"
>
Pending requests
</h3>
<h3
class=
"ui header"
>
{{
$t
(
'
Pending requests
'
)
}}
</h3>
<div
class=
"ui list"
>
<div
v-for=
"request in requests"
class=
"item"
>
<div
class=
"content"
>
...
...
front/src/components/requests/RequestsList.vue
View file @
b4b481cf
<
template
>
<div
v-title=
"'Import Requests'"
>
<div
class=
"ui vertical stripe segment"
>
<h2
class=
"ui header"
>
Music requests
</h2>
<h2
class=
"ui header"
>
{{
$t
(
'
Music requests
'
)
}}
</h2>
<div
:class=
"['ui',
{'loading': isLoading}, 'form']">
<div
class=
"fields"
>
<div
class=
"field"
>
<label>
Search
</label>
<label>
{{
$t
(
'
Search
'
)
}}
</label>
<input
type=
"text"
v-model=
"query"
placeholder=
"Enter an artist name, a username..."
/>
</div>
<div
class=
"field"
>
<label>
Ordering
</label>
<label>
{{
$t
(
'
Ordering
'
)
}}
</label>
<select
class=
"ui dropdown"
v-model=
"ordering"
>
<option
v-for=
"option in orderingOptions"
:value=
"option[0]"
>
{{
option
[
1
]
}}
...
...
@@ -17,14 +17,14 @@
</select>
</div>
<div
class=
"field"
>
<label>
Ordering direction
</label>
<label>
{{
$t
(
'
Ordering direction
'
)
}}
</label>
<select
class=
"ui dropdown"
v-model=
"orderingDirection"
>
<option
value=
""
>
Ascending
</option>
<option
value=
"-"
>
Descending
</option>
</select>
</div>
<div
class=
"field"
>
<label>
Results per page
</label>
<label>
{{
$t
(
'
Results per page
'
)
}}
</label>
<select
class=
"ui dropdown"
v-model=
"paginateBy"
>
<option
:value=
"parseInt(12)"
>
12
</option>
<option
:value=
"parseInt(25)"
>
25
</option>
...
...
@@ -96,12 +96,7 @@ export default {
query
:
this
.
defaultQuery
,
paginateBy
:
parseInt
(
this
.
defaultPaginateBy
||
12
),
orderingDirection
:
defaultOrdering
.
direction
,
ordering
:
defaultOrdering
.
field
,
orderingOptions
:
[
[
'
creation_date
'
,
'
Creation date
'
],
[
'
artist_name
'
,
'
Artist name
'
],
[
'
user__username
'
,
'
User
'
]
]
ordering
:
defaultOrdering
.
field
}
},
created
()
{
...
...
@@ -141,6 +136,15 @@ export default {
this
.
page
=
page
}
},
computed
:
{
orderingOptions
:
function
()
{
return
[
[
'
creation_date
'
,
this
.
$t
(
'
Creation date
'
)],
[
'
artist_name
'
,
this
.
$t
(
'
Artist name
'
)],
[
'
user__username
'
,
this
.
$t
(
'
User
'
)]
]
}
},
watch
:
{
page
()
{
this
.
updateQueryString
()
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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