Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
converse.js
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
converse.js
Commits
7a359562
Commit
7a359562
authored
May 15, 2015
by
thierrytiti
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add placeholder for 'Insert a smiley'
parent
0511f9a5
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
1 deletion
+3
-1
converse.js
converse.js
+1
-0
docs/CHANGES.rst
docs/CHANGES.rst
+1
-0
src/templates/toolbar.html
src/templates/toolbar.html
+1
-1
No files found.
converse.js
View file @
7a359562
...
@@ -1567,6 +1567,7 @@
...
@@ -1567,6 +1567,7 @@
allow_otr
:
converse
.
allow_otr
&&
!
this
.
is_chatroom
,
allow_otr
:
converse
.
allow_otr
&&
!
this
.
is_chatroom
,
label_clear
:
__
(
'
Clear all messages
'
),
label_clear
:
__
(
'
Clear all messages
'
),
label_end_encrypted_conversation
:
__
(
'
End encrypted conversation
'
),
label_end_encrypted_conversation
:
__
(
'
End encrypted conversation
'
),
label_insert_smiley
:
__
(
'
Insert a smiley
'
),
label_hide_participants
:
__
(
'
Hide the list of participants
'
),
label_hide_participants
:
__
(
'
Hide the list of participants
'
),
label_refresh_encrypted_conversation
:
__
(
'
Refresh encrypted conversation
'
),
label_refresh_encrypted_conversation
:
__
(
'
Refresh encrypted conversation
'
),
label_start_call
:
__
(
'
Start a call
'
),
label_start_call
:
__
(
'
Start a call
'
),
...
...
docs/CHANGES.rst
View file @
7a359562
...
@@ -8,6 +8,7 @@ Changelog
...
@@ -8,6 +8,7 @@ Changelog
* Bugfix. Manual login doesn't work when only websocket_url is set and not bosh_service_url. [jcbrand]
* Bugfix. Manual login doesn't work when only websocket_url is set and not bosh_service_url. [jcbrand]
* Bugfix. clearSessions during unload event would throw an error when not logged in. [gbonvehi]
* Bugfix. clearSessions during unload event would throw an error when not logged in. [gbonvehi]
* #389 Allow login panel placeholders and roster item 'Name' translations. [gbonvehi]
* #389 Allow login panel placeholders and roster item 'Name' translations. [gbonvehi]
* Add placeholder for "Insert a smiley" translation [thierrytiti]
0.9.3 (2015-05-01)
0.9.3 (2015-05-01)
------------------
------------------
...
...
src/templates/toolbar.html
View file @
7a359562
{[ if (show_emoticons) { ]}
{[ if (show_emoticons) { ]}
<li
class=
"toggle-smiley icon-happy"
title=
"
Insert a smilery
"
>
<li
class=
"toggle-smiley icon-happy"
title=
"
{{label_insert_smiley}}
"
>
<ul>
<ul>
<li><a
class=
"icon-smiley"
href=
"#"
data-emoticon=
":)"
></a></li>
<li><a
class=
"icon-smiley"
href=
"#"
data-emoticon=
":)"
></a></li>
<li><a
class=
"icon-wink"
href=
"#"
data-emoticon=
";)"
></a></li>
<li><a
class=
"icon-wink"
href=
"#"
data-emoticon=
";)"
></a></li>
...
...
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