Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
pleroma-fe
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Pleroma
pleroma-fe
Commits
6847e70a
Commit
6847e70a
authored
5 years ago
by
Jared Redford
Browse files
Options
Downloads
Patches
Plain Diff
#470
- update i18n
parent
748b1ed1
No related branches found
Branches containing commit
No related tags found
Tags containing commit
2 merge requests
!1028
`master` refresh with `develop`
,
!721
Resolve "Handling subjects/spoiler_text/cw not working properly"
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/components/status/status.vue
+5
-5
5 additions, 5 deletions
src/components/status/status.vue
src/i18n/en.json
+3
-1
3 additions, 1 deletion
src/i18n/en.json
with
8 additions
and
6 deletions
src/components/status/status.vue
+
5
−
5
View file @
6847e70a
...
...
@@ -98,16 +98,16 @@
</div>
<div
class=
"status-content-wrapper"
:class=
"{ 'tall-status': !showingLongSubject }"
v-if=
"longSubject"
>
<a
class=
"tall-status-hider"
:class=
"{ 'tall-status-hider_focused': isFocused }"
v-if=
"!showingLongSubject"
href=
"#"
@
click.prevent=
"showingLongSubject=true"
>
S
how
more
</a>
<a
class=
"tall-status-hider"
:class=
"{ 'tall-status-hider_focused': isFocused }"
v-if=
"!showingLongSubject"
href=
"#"
@
click.prevent=
"showingLongSubject=true"
>
{{$t("general.s
how
_
more
")}}
</a>
<div
@
click.prevent=
"linkClicked"
class=
"status-content media-body"
v-html=
"contentHtml"
></div>
<a
v-if=
"showingLongSubject"
href=
"#"
class=
"status-unhider"
@
click.prevent=
"showingLongSubject=false"
>
S
how
less
</a>
<a
v-if=
"showingLongSubject"
href=
"#"
class=
"status-unhider"
@
click.prevent=
"showingLongSubject=false"
>
{{$t("general.s
how
_
less
")}}
</a>
</div>
<div
:class=
"{'tall-status': hideTallStatus}"
class=
"status-content-wrapper"
v-else
>
<a
class=
"tall-status-hider"
:class=
"{ 'tall-status-hider_focused': isFocused }"
v-if=
"hideTallStatus"
href=
"#"
@
click.prevent=
"toggleShowMore"
>
S
how
more
</a>
<a
class=
"tall-status-hider"
:class=
"{ 'tall-status-hider_focused': isFocused }"
v-if=
"hideTallStatus"
href=
"#"
@
click.prevent=
"toggleShowMore"
>
{{$t("general.s
how
_
more
")}}
</a>
<div
@
click.prevent=
"linkClicked"
class=
"status-content media-body"
v-html=
"contentHtml"
v-if=
"!hideSubjectStatus"
></div>
<div
@
click.prevent=
"linkClicked"
class=
"status-content media-body"
v-html=
"status.summary_html"
v-else
></div>
<a
v-if=
"hideSubjectStatus"
href=
"#"
class=
"cw-status-hider"
@
click.prevent=
"toggleShowMore"
>
S
how
more
</a>
<a
v-if=
"showingMore"
href=
"#"
class=
"status-unhider"
@
click.prevent=
"toggleShowMore"
>
S
how
less
</a>
<a
v-if=
"hideSubjectStatus"
href=
"#"
class=
"cw-status-hider"
@
click.prevent=
"toggleShowMore"
>
{{$t("general.s
how
_
more
")}}
</a>
<a
v-if=
"showingMore"
href=
"#"
class=
"status-unhider"
@
click.prevent=
"toggleShowMore"
>
{{$t("general.s
how
_
less
")}}
</a>
</div>
<div
v-if=
"status.attachments && (!hideSubjectStatus || showingLongSubject)"
class=
"attachments media-body"
>
...
...
This diff is collapsed.
Click to expand it.
src/i18n/en.json
+
3
−
1
View file @
6847e70a
...
...
@@ -20,7 +20,9 @@
"submit"
:
"Submit"
,
"more"
:
"More"
,
"generic_error"
:
"An error occured"
,
"optional"
:
"optional"
"optional"
:
"optional"
,
"show_more"
:
"Show More"
,
"show_less"
:
"Show Less"
},
"image_cropper"
:
{
"crop_picture"
:
"Crop picture"
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment