Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
25
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Add placeholder for 'Insert a smiley'

Browse Source
This commit is contained in:
thierrytiti 2015-05-15 12:01:29 +02:00
parent 0511f9a588
commit 7a359562ad
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
converse.js
View File

@ -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'),

1
docs/CHANGES.rst
View File

@ -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)
------------------ ------------------

2
src/templates/toolbar.html
View File

@ -1,5 +1,5 @@
{[ 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>