Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
moodle
moodle
Commits
f422e24d
Commit
f422e24d
authored
Mar 12, 2019
by
Jan Dageförde
Committed by
Eloy Lafuente
Mar 20, 2019
Browse files
MDL-65059 messaging: don't refer to block plugin type
AMOS BEGIN CPY [block,core],[blockuserconfirmbutton,core_message] AMOS END
parent
a67f9a9b
Changes
2
Hide whitespace changes
Inline
Side-by-side
lang/en/message.php
View file @
f422e24d
...
...
@@ -36,6 +36,7 @@ $string['blockcontact'] = 'Block contact';
$string
[
'blockedusers'
]
=
'Blocked users'
;
$string
[
'blockuser'
]
=
'Block user'
;
$string
[
'blockuserconfirm'
]
=
'Are you sure you want to block {$a}?'
;
$string
[
'blockuserconfirmbutton'
]
=
'Block'
;
$string
[
'blocknoncontacts'
]
=
'Prevent non-contacts from messaging me'
;
$string
[
'canceledit'
]
=
'Cancel editing messages'
;
$string
[
'contactableprivacy'
]
=
'Accept messages from:'
;
...
...
message/templates/message_drawer_view_conversation_body_confirm_dialogue.mustache
View file @
f422e24d
...
...
@@ -39,7 +39,7 @@
<h3
class=
"h6 hidden"
data-region=
"dialogue-header"
></h3>
<p
class=
"text-muted"
data-region=
"dialogue-text"
></p>
<button
type=
"button"
class=
"btn btn-primary btn-block hidden"
data-action=
"confirm-block"
>
<span
data-region=
"dialogue-button-text"
>
{{#
str
}}
block
, cor
e
{{/
str
}}
</span>
<span
data-region=
"dialogue-button-text"
>
{{#
str
}}
block
userconfirmbutton, core_messag
e
{{/
str
}}
</span>
<span
class=
"hidden"
data-region=
"loading-icon-container"
>
{{>
core
/
loading
}}
</span>
</button>
<button
type=
"button"
class=
"btn btn-primary btn-block hidden"
data-action=
"confirm-unblock"
>
...
...
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