October 2014 - tor-commits - lists.torproject.org

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 24 Oct '14

24 Oct '14

commit 06fa10ed468be943ce5700ad73ff1aa36f284af7 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 24 12:45:16 2014 +0000 Update translations for https_everywhere --- lt/ssl-observatory.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lt/ssl-observatory.dtd b/lt/ssl-observatory.dtd index 8e7f4ac..54c83a2 100644 --- a/lt/ssl-observatory.dtd +++ b/lt/ssl-observatory.dtd @@ -45,10 +45,10 @@ korporatyvinį tinklą:"> "Gaus ir išsiųs jūsų tinklo "autonominį sistemos numerį". Tai padės mums aptikti atakas nukreiptas prieš HTTPS ir nustatyti, ar mes turime duomenų apie tinklus iš tokių vietų kaip Iranas ar Sirija, kur atakos yra gana dažnos."> <!ENTITY ssl-observatory.prefs.show_cert_warning -"Show a warning when the Observatory detects a revoked certificate not caught by your browser"> +"Įspėti, kai jei Observatory aptiks Jūsų naršyklės neaptiktą sertifikatą, kurio galiojimas atšauktas."> <!ENTITY ssl-observatory.prefs.show_cert_warning_tooltip -"This will check submitted certificates against known Certificate Revocation Lists. Unfortunately we cannot guarantee that we will flag every revoked certificate, but if you do see a warning there's a good chance something is wrong."> +"Pateikti sertifikatai bus patikrinti Atšauktų Sertifikatų Sąraše. Deja, negalime garantuoti, kad bus nustatyti visi atšaukti sertifikatai, tačiau jei pamatysite įspėjimą, žinosite, kad tikriausiai kažkas yra negerai."> <!ENTITY ssl-observatory.prefs.done "Atlikta">

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 24 Oct '14

24 Oct '14

commit 6001b54c5cc28f6b64e701d9e14db178b8e25018 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 24 12:15:41 2014 +0000 Update translations for tor-launcher-network-settings --- lt/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lt/network-settings.dtd b/lt/network-settings.dtd index 0e51ad5..94d685b 100644 --- a/lt/network-settings.dtd +++ b/lt/network-settings.dtd @@ -26,7 +26,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restartTor "Restart Tor"> +<!ENTITY torsettings.restartTor "Pakartotinai paleisti Tor"> <!ENTITY torsettings.optional "Optional">

1 0

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 24 Oct '14

24 Oct '14

commit d56e22298b53347e416e8333a603c7fc850ddeec Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 24 12:15:33 2014 +0000 Update translations for tor-launcher-properties --- lt/torlauncher.properties | 52 ++++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/lt/torlauncher.properties b/lt/torlauncher.properties index b1f594d..2284a93 100644 --- a/lt/torlauncher.properties +++ b/lt/torlauncher.properties @@ -4,40 +4,40 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team. -torlauncher.tor_exited2=Restarting Tor will not close your browser tabs. +torlauncher.tor_exited2=Pakartotinai paleidus Tor naršyklės kortelės nebus uždarytos. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor nepavyko paleisti. -torlauncher.tor_control_failed=Failed to take control of Tor. +torlauncher.tor_control_failed=Nepavyko perimti Tor valdymo torlauncher.tor_bootstrap_failed=Tor nepavyko užmegzti ryšio su Tor tinklu. -torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). +torlauncher.tor_bootstrap_failed_details=%1$S nepavyko (%2$S). torlauncher.unable_to_start_tor=Nepavyksta paleisti Tor.\n\n%S -torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.tor_missing=Trūksta Tor vykdomojo failo. +torlauncher.torrc_missing=Trūksta torrc failo +torlauncher.datadir_missing=Nesukurtas Tor duomenų aplankas torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S -torlauncher.failed_to_save_settings=Unable to save Tor settings.\n\n%S -torlauncher.ensure_tor_is_running=Please ensure that Tor is running. +torlauncher.failed_to_save_settings=Nepavyko įrašyti Tor nustatymo parametrų.\n\n%S +torlauncher.ensure_tor_is_running=Įsitikinkite, kad Tor yra vykdomas. -torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet. -torlauncher.error_proxy_type_missing=You must select the proxy type. -torlauncher.error_bridges_missing=You must specify one or more bridges. -torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. +torlauncher.error_proxy_addr_missing=Jei norite, kad Tor prie interneto jungtųsi per įgaliotąjį serverį, turite nurodyti ir prievado numerį, ir serverio IP adresą arba serverio vardą. +torlauncher.error_proxy_type_missing=Turite pasirinkti įgaliotojo serverio tipą. +torlauncher.error_bridges_missing=Turite nurodyti bent vieną tinklų tiltą +torlauncher.error_default_bridges_type_missing=Turite pasirinkti perdavimo būdą nurodytiems tinklų tiltams torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. torlauncher.recommended_bridge=(rekomenduojama) torlauncher.connect=Prisijungti -torlauncher.restart_tor=Restart Tor +torlauncher.restart_tor=Pakartotinai paleisti Tor torlauncher.quit=Nutraukti torlauncher.quit_win=Išeiti torlauncher.done=Atlikta -torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance=Jei Jums reikia pagalbos, susisiekti galite su %S -torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. +torlauncher.copiedNLogMessages=Kopijavimas atliktas. %S Tor įvykių žurnalas paruoštas įklijuoti į teksto redagavimo programą ar elektroninio pašto pranešimą. torlauncher.bootstrapStatus.conn_dir=Jungiamasi prie retransliavimo taškų torlauncher.bootstrapStatus.handshake_dir=Užmezgiamas ryšys @@ -48,14 +48,14 @@ torlauncher.bootstrapStatus.requesting_descriptors=Užklausiama retransliacijos torlauncher.bootstrapStatus.loading_descriptors=Įkeliama retransliacijos taško informacija torlauncher.bootstrapStatus.conn_or=Jungiamasi prie Tor tinklo torlauncher.bootstrapStatus.handshake_or=Užmezgiamas sujungimas -torlauncher.bootstrapStatus.done=Connected to the Tor network! - -torlauncher.bootstrapWarning.done=done -torlauncher.bootstrapWarning.connectrefused=connection refused -torlauncher.bootstrapWarning.misc=miscellaneous -torlauncher.bootstrapWarning.resourcelimit=insufficient resources -torlauncher.bootstrapWarning.identity=identity mismatch -torlauncher.bootstrapWarning.timeout=connection timeout -torlauncher.bootstrapWarning.noroute=no route to host -torlauncher.bootstrapWarning.ioerror=read/write error -torlauncher.bootstrapWarning.pt_missing=missing pluggable transport +torlauncher.bootstrapStatus.done=Prisijungta prie Tor tinklo! + +torlauncher.bootstrapWarning.done=atlikta +torlauncher.bootstrapWarning.connectrefused=atsisakyta sujungti +torlauncher.bootstrapWarning.misc=įvairūs +torlauncher.bootstrapWarning.resourcelimit=nepakanka išteklių +torlauncher.bootstrapWarning.identity=tapatybės neatitiktis +torlauncher.bootstrapWarning.timeout=per nustatytą laiką nepavyko prisijungti +torlauncher.bootstrapWarning.noroute=nėra maršruto iki pagrindinio kompiuterio +torlauncher.bootstrapWarning.ioerror=skaitymo/rašymo klaida +torlauncher.bootstrapWarning.pt_missing=Trūksta įterpiamojo perdavimo

1 0

[pups/production] Merge remote-tracking branch 'sherief/bug12153'
by colin＠torproject.org 24 Oct '14

24 Oct '14

commit 88b7385d88ffb245a097036933d9ec21f83700d3 Merge: 9d1cdab 5e44016 Author: Lunar <lunar@loar> Date: Sat Oct 11 22:14:52 2014 +0200 Merge remote-tracking branch 'sherief/bug12153' static/css/styles.css | 46 +++++++++++++++++++++++----- static/images/prodromus_bubble_bottom.png | Bin 2344 -> 1426 bytes static/images/prodromus_bubble_content.png | Bin 4850 -> 1076 bytes static/images/prodromus_bubble_top.png | Bin 2161 -> 1278 bytes 4 files changed, 38 insertions(+), 8 deletions(-)

1 0

[pups/production] [#12153] Expands Webchat's chat window
by colin＠torproject.org 24 Oct '14

24 Oct '14

commit 5e44016f48a98f0fd906d0bfa8bf9029e8394412 Author: Sherief Alaa <sheriefalaa.w(a)gmail.com> Date: Fri Oct 10 06:03:47 2014 +0200 [#12153] Expands Webchat's chat window --- static/css/styles.css | 46 +++++++++++++++++++++++----- static/images/prodromus_bubble_bottom.png | Bin 2344 -> 1426 bytes static/images/prodromus_bubble_content.png | Bin 4850 -> 1076 bytes static/images/prodromus_bubble_top.png | Bin 2161 -> 1278 bytes 4 files changed, 38 insertions(+), 8 deletions(-) diff --git a/static/css/styles.css b/static/css/styles.css index d4467eb..3abeeb3 100644 --- a/static/css/styles.css +++ b/static/css/styles.css @@ -1,10 +1,11 @@ + body { background-image: url('/static/images/webchat-background.png'); background-repeat:no-repeat; background-position: right top; } div#prodromus { - width: 420px; + width: 840px; border: 1px solid #C9C9C9; margin: 10px auto 20px auto; padding: 10px; @@ -64,8 +65,8 @@ div#prodromus div#prodromus-messaging { } div#prodromus div#prodromus-log { - height: 300px; - width: 388px; + height: 600px; + width: 808px; border: 1px solid #999999; background-color: #FFFFFF; overflow: auto; @@ -80,9 +81,10 @@ div#prodromus div#prodromus-log { } div#prodromus div#prodromus-log div.message { - width: 350px; + width: 650px; background: transparent url(../images/prodromus_bubble_top.png) left top no-repeat; padding-top: 9px; + padding-bottom: 5px; margin: 0 auto; } @@ -120,7 +122,7 @@ div#prodromus div#prodromus-log div.messageSystem { div#prodromus div#prodromus-log div.message span.msgText { display: block; font-weight: bold; - background: #E0E1E1 url(../images/prodromus_bubble_content.png) left top no-repeat; + background: #c8c5c5 url(../images/prodromus_bubble_content.png) left top no-repeat; padding: 0px 12px; word-wrap: break-word; } @@ -129,7 +131,7 @@ div#prodromus div#prodromus-log div.message span.msgPerson { display: block; background: transparent url(../images/prodromus_bubble_bottom.png) left top no-repeat; height: 25px; - padding: 12px 0 0 50px; + padding: 15px 0 0 50px; font-size: 0.8em; } @@ -138,7 +140,7 @@ div#prodromus div#prodromus-log div.message span.msgPerson span.msgTime { } div#prodromus div#prodromus-messaging textarea#prodromus-message { - width: 388px; + width: 735px; border: 1px solid #999999; margin: 5px 5px 0; -moz-border-radius: 5px; @@ -176,4 +178,32 @@ div#prodromus div#prodromus-messaging input#prodromus-sendmessage { margin: 0 auto; left:0; right:100px; -} \ No newline at end of file +} + + +.bubble { + position: relative; + width: 350px; + height: 48px; + padding: 0px; + background: #d9d9d9; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; + -webkit-box-shadow: 2px 2px 10px 0px #616161; + -moz-box-shadow: 2px 2px 10px 0px #616161; + box-shadow: 2px 2px 10px 0px #616161; +} + +.bubble:after { + content: ""; + position: absolute; + bottom: -15px; + left: 37px; + border-style: solid; + border-width: 15px 15px 0; + border-color: #d9d9d9 transparent; + display: block; + width: 0; + z-index: 1; +} diff --git a/static/images/prodromus_bubble_bottom.png b/static/images/prodromus_bubble_bottom.png old mode 100644 new mode 100755 index d018772..dc218fd Binary files a/static/images/prodromus_bubble_bottom.png and b/static/images/prodromus_bubble_bottom.png differ diff --git a/static/images/prodromus_bubble_content.png b/static/images/prodromus_bubble_content.png old mode 100644 new mode 100755 index 127e004..db50b8f Binary files a/static/images/prodromus_bubble_content.png and b/static/images/prodromus_bubble_content.png differ diff --git a/static/images/prodromus_bubble_top.png b/static/images/prodromus_bubble_top.png old mode 100644 new mode 100755 index bb02d75..91ff82e Binary files a/static/images/prodromus_bubble_top.png and b/static/images/prodromus_bubble_top.png differ

1 0

[pups/production] added a new db column (visits) which acts as a counter for visits per token by users
by colin＠torproject.org 24 Oct '14

24 Oct '14

commit 331658438dc31b8ae1b4e487a4aeccfd373d1419 Author: Sherief Alaa <sheriefalaa.w(a)gmail.com> Date: Mon Jun 2 06:40:54 2014 +0300 added a new db column (visits) which acts as a counter for visits per token by users --- pups/settings.py.sample | 1 + webchat/models.py | 12 +++++++++++- webchat/views.py | 17 +++++++++++------ 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/pups/settings.py.sample b/pups/settings.py.sample index 97d4ab6..85607cf 100644 --- a/pups/settings.py.sample +++ b/pups/settings.py.sample @@ -98,6 +98,7 @@ INSTALLED_APPS = ( 'pups', 'webchat', 'stats', + 'south' ) TEMPLATE_CONTEXT_PROCESSORS = ( diff --git a/webchat/models.py b/webchat/models.py index b475a6d..375ba04 100644 --- a/webchat/models.py +++ b/webchat/models.py @@ -36,9 +36,10 @@ class Token(models.Model): created_at = models.DateTimeField(auto_now_add=True) expires_at = models.DateTimeField() comment = models.CharField(max_length=128) + visits = models.IntegerField(default=0) def __unicode__(self): - return u'ID: %s Owner: %s' % (self.t_id, self.owner) + return u'ID: %s Owner: %s visits: %s' % (self.t_id, self.owner, self.visits) def create_token(self, owner_id, expiration_days, comment): q = Token( @@ -73,3 +74,12 @@ class Token(models.Model): ''' return Token.objects.filter(owner=assistant).order_by('-t_id')\ .filter(expires_at__gt=timezone.now()) + + def increment_visits(self, id): + token = Token.objects.filter(t_id=id) + + if not token: + return False + + token.update(visits=F('visits')+1) + return True diff --git a/webchat/views.py b/webchat/views.py index aec8135..f5b9aad 100644 --- a/webchat/views.py +++ b/webchat/views.py @@ -86,20 +86,25 @@ def chat(request, token): and did not expire. ''' - t = Token() - t_obj = get_object_or_404(Token, token=token) + requested_token = get_object_or_404(Token, token=token) # Make sure token didn't expire - if t_obj.expires_at < timezone.now(): + if requested_token.expires_at < timezone.now(): return render(request, "token_exp.html") params = { 'server': settings.CONFIG['server'], 'bosh': settings.CONFIG['bosh'], - 'receiver': t_obj.owner.username + settings.CONFIG['receiver'], - 'receiver_name': t_obj.owner.username, - 'token': token + 'receiver': + requested_token.owner.username + settings.CONFIG['receiver'], + 'receiver_name': requested_token.owner.username, + 'token': token, + 'comment': requested_token.comment } + + # Count visits for metrics + requested_token.increment_visits(requested_token.pk) + return render(request, 'prodromus.html', params)

1 0

[pups/production] using django's slice instead of truncatechars
by colin＠torproject.org 24 Oct '14

24 Oct '14

commit 26969dfcf0cf5570b17e4820ba3d470293d413fd Author: Sherief Alaa <sheriefalaa.w(a)gmail.com> Date: Tue Jun 17 14:45:08 2014 +0300 using django's slice instead of truncatechars --- webchat/templates/tokens.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webchat/templates/tokens.html b/webchat/templates/tokens.html index a6f297f..20c3de1 100644 --- a/webchat/templates/tokens.html +++ b/webchat/templates/tokens.html @@ -48,7 +48,7 @@ <td>https://{{url}}/chat/{{token.token}}</td> <td>{{token.expires_at|date:"Y-m-d G:i"}}</td> <td class="comment" onclick="full_comment({{token.t_id}});"> - {{token.comment|truncatechars:35}} + {{token.comment|slice:":35"}} {% if token.comment|length > 35 %} <span data-toggle="modal" data-target="#comment-modal" style="color:blue; font-size:80%;"> more</span>

1 0

[pups/production] using .text() instead of .html() to prevent xss attacks
by colin＠torproject.org 24 Oct '14

24 Oct '14

commit 1b5b3d614ee2fddfaf046ca02059db5441ff2a91 Author: Sherief Alaa <sheriefalaa.w(a)gmail.com> Date: Tue Jun 17 13:44:43 2014 +0300 using .text() instead of .html() to prevent xss attacks --- webchat/templates/tokens.html | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/webchat/templates/tokens.html b/webchat/templates/tokens.html index db6ab73..a6f297f 100644 --- a/webchat/templates/tokens.html +++ b/webchat/templates/tokens.html @@ -9,15 +9,8 @@ <script type="text/javascript" src="/static/js/jquery.min.js"></script> <script src="/static/js/bootstrap.min.js"></script> <script type="text/javascript"> - $(document).ready (function (){ - $(".comment").html(function(){ - $(this).html($(this).text().substring(0,35) - + ' <span data-toggle="modal" data-target="#comment-modal" style="color:blue; font-size:80%;"> Read more..</span>'); - }); - }); - function full_comment(id){ - $(".comment-modal-body").html($("#full-comment-" + id).val()); + $(".comment-modal-body").text($("#full-comment-" + id).val()); } </script> {% endblock script %} @@ -54,7 +47,13 @@ <td><input name="selected_list" type="checkbox" value="{{token.token}}"></td> <td>https://{{url}}/chat/{{token.token}}</td> <td>{{token.expires_at|date:"Y-m-d G:i"}}</td> - <td class="comment" onclick="full_comment({{token.t_id}});">{{token.comment}}</td> + <td class="comment" onclick="full_comment({{token.t_id}});"> + {{token.comment|truncatechars:35}} + + {% if token.comment|length > 35 %} + <span data-toggle="modal" data-target="#comment-modal" style="color:blue; font-size:80%;"> more</span> + {% endif %} + </td> </tr> <input id="full-comment-{{token.t_id}}" type="hidden" value="{{token.comment}}"> {% endfor %}

1 0

[pups/production] Swapped variables for constants in prodromus.js
by colin＠torproject.org 24 Oct '14

24 Oct '14

commit 1de141d1c8602e2d6f0e9f5a7ac1495677286ef3 Author: Sherief Alaa <sheriefalaa.w(a)gmail.com> Date: Tue Jun 17 13:41:30 2014 +0300 Swapped variables for constants in prodromus.js --- static/js/prodromus.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/static/js/prodromus.js b/static/js/prodromus.js index ee9f7c7..7dbe826 100644 --- a/static/js/prodromus.js +++ b/static/js/prodromus.js @@ -42,9 +42,9 @@ * @license Affero General Public License */ -_assistantNotAvailable = 0 -_assistantAvailable = 1 -_serverError = 2 +const ASSISTANT_NOT_AVAILABLE = 0 +const ASSISTANT_AVAILABLE = 1 +const SERVER_ERROR = 2 var assisantStatus; var status_msg; @@ -227,7 +227,7 @@ Prodromus.actionhandler = { Prodromus.buildAndSendMessage( Prodromus.Util.htmlspecialchars( Prodromus.config.SENDERNAME ) + Prodromus.i18n.t9n( 'msg-hello' ) - , 'chat' + , 'chat' ); Prodromus.buildAndSendMessage("Token: " + Prodromus.config.TOKEN, 'chat', true); @@ -463,20 +463,20 @@ Prodromus.PresenceReporter = // Available if ( (presence_type === undefined) && (show === '' || show === 'chat') ) { - assisantStatus = _assistantAvailable; + assisantStatus = ASSISTANT_AVAILABLE; return true; } // Not Available if (presence_type === 'unavailable' || show === 'xa' || show === 'dnd' || 'away') { - assisantStatus = _assistantNotAvailable; + assisantStatus = ASSISTANT_NOT_AVAILABLE; return true; } } else { - assisantStatus = _serverError; + assisantStatus = SERVER_ERROR; } } return true; @@ -493,7 +493,7 @@ Prodromus.PresenceReporter = giveFeedback: function() { - if (assisantStatus !== _assistantAvailable) + if (assisantStatus !== ASSISTANT_AVAILABLE) { if (status_msg !== undefined) {

1 0

[pups/production] Sends token & comment when the chat session starts
by colin＠torproject.org 24 Oct '14

24 Oct '14

commit 93196c65a5619adbb29477c882d0e60756f2681e Author: Sherief Alaa <sheriefalaa.w(a)gmail.com> Date: Thu Sep 4 09:34:35 2014 +0300 Sends token & comment when the chat session starts Sends token and comment of the related ticket to the support assistant at the start of the chat session without sending them to the user's web UI. --- static/js/prodromus.js | 17 ++++++++++++----- webchat/templates/prodromus.html | 4 +++- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/static/js/prodromus.js b/static/js/prodromus.js index 916df2c..ee9f7c7 100644 --- a/static/js/prodromus.js +++ b/static/js/prodromus.js @@ -129,7 +129,7 @@ Prodromus.Util = { } -Prodromus.buildAndSendMessage = function( message, type ) { +Prodromus.buildAndSendMessage = function( message, type, toAssistant) { var msg = $msg({from: Prodromus.connection.jid, to: Prodromus.config.RECEIVER, type: type}) .c("body").t(message).up() @@ -139,7 +139,11 @@ Prodromus.buildAndSendMessage = function( message, type ) { Prodromus.connection.send( msg ); - Prodromus.UI.log( message, "msgOut" ); + // Display the message on the web UI if the user was meant to see it. + // Mainly used to hide the comment the assistant writes. + if(!toAssistant){ + Prodromus.UI.log( message, "msgOut" ); + } } Prodromus.actionhandler = { @@ -222,9 +226,13 @@ Prodromus.actionhandler = { Prodromus.connection.send( $pres() ); Prodromus.buildAndSendMessage( - Prodromus.Util.htmlspecialchars( Prodromus.config.SENDERNAME ) + Prodromus.i18n.t9n( 'msg-hello' ) + Prodromus.i18n.t9n( 'token' ) + Prodromus.Util.htmlspecialchars( Prodromus.config.SENDERNAME ) + Prodromus.i18n.t9n( 'msg-hello' ) , 'chat' ); + + Prodromus.buildAndSendMessage("Token: " + Prodromus.config.TOKEN, 'chat', true); + Prodromus.buildAndSendMessage("Comment: " + Prodromus.config.COMMENT, 'chat', true); + break; } }, @@ -346,8 +354,7 @@ Prodromus.t9n = { 'send': 'Send', 'failed-to-connect': 'Failed to connect to the server!', 'msg-hello': ' joins the chat.', - 'msg-goodbye': ' leaves the chat. ', - 'token': " Token: " + Prodromus.config.TOKEN + 'msg-goodbye': ' leaves the chat. ' } } diff --git a/webchat/templates/prodromus.html b/webchat/templates/prodromus.html index 9a97f40..8acaf9c 100644 --- a/webchat/templates/prodromus.html +++ b/webchat/templates/prodromus.html @@ -56,7 +56,9 @@ 'LANGUAGE': 'en', // stores the token of this session - 'TOKEN': '{{token}}' + 'TOKEN': '{{token}}', + + 'COMMENT': '{{comment}}' } </script>

1 0