瀏覽代碼

Use "XMPP address" instead of "XMPP username"

JC Brand 6 年之前
父節點
當前提交
4463b44773

+ 1 - 1
src/converse-muc-views.js

@@ -1939,7 +1939,7 @@ converse.plugins.add('converse-muc-views', {
                       jid = el.value;
                       jid = el.value;
                 if (!jid || _.compact(jid.split('@')).length < 2) {
                 if (!jid || _.compact(jid.split('@')).length < 2) {
                     evt.target.outerHTML = tpl_chatroom_invite({
                     evt.target.outerHTML = tpl_chatroom_invite({
-                        'error_message': __('Please enter a valid XMPP username'),
+                        'error_message': __('Please enter a valid XMPP address'),
                         'label_invitation': __('Invite'),
                         'label_invitation': __('Invite'),
                     });
                     });
                     this.initInviteWidget();
                     this.initInviteWidget();

+ 2 - 2
src/templates/chatroom_details_modal.html

@@ -43,10 +43,10 @@
                         <li class="feature" ><span class="fa fa-snowflake-o"></span>{{{ o.__('Temporary') }}} - <em>{{{ o.__('This groupchat will disappear once the last person leaves') }}}</em></li>
                         <li class="feature" ><span class="fa fa-snowflake-o"></span>{{{ o.__('Temporary') }}} - <em>{{{ o.__('This groupchat will disappear once the last person leaves') }}}</em></li>
                         {[ } ]}
                         {[ } ]}
                         {[ if (o.features.nonanonymous) { ]}
                         {[ if (o.features.nonanonymous) { ]}
-                        <li class="feature" ><span class="fa fa-id-card"></span>{{{ o.__('Not anonymous') }}} - <em>{{{ o.__('All other groupchat participants can see your XMPP username') }}}</em></li>
+                        <li class="feature" ><span class="fa fa-id-card"></span>{{{ o.__('Not anonymous') }}} - <em>{{{ o.__('All other groupchat participants can see your XMPP address') }}}</em></li>
                         {[ } ]}
                         {[ } ]}
                         {[ if (o.features.semianonymous) { ]}
                         {[ if (o.features.semianonymous) { ]}
-                        <li class="feature" ><span class="fa fa-user-secret"></span>{{{ o.__('Semi-anonymous') }}} - <em>{{{ o.__('Only moderators can see your XMPP username') }}}</em></li>
+                        <li class="feature" ><span class="fa fa-user-secret"></span>{{{ o.__('Semi-anonymous') }}} - <em>{{{ o.__('Only moderators can see your XMPP address') }}}</em></li>
                         {[ } ]}
                         {[ } ]}
                         {[ if (o.features.moderated) { ]}
                         {[ if (o.features.moderated) { ]}
                         <li class="feature" ><span class="fa fa-gavel"></span>{{{ o.__('Moderated') }}} - <em>{{{ o.__('Participants entering this groupchat need to request permission to write') }}}</em></li>
                         <li class="feature" ><span class="fa fa-gavel"></span>{{{ o.__('Moderated') }}} - <em>{{{ o.__('Participants entering this groupchat need to request permission to write') }}}</em></li>

+ 2 - 2
src/templates/chatroom_features.html

@@ -25,10 +25,10 @@
 <li class="feature" title="{{{ o.__('This groupchat will disappear once the last person leaves') }}}"><span class="fa fa-snowflake"></span>{{{ o.__('Temporary') }}}</li>
 <li class="feature" title="{{{ o.__('This groupchat will disappear once the last person leaves') }}}"><span class="fa fa-snowflake"></span>{{{ o.__('Temporary') }}}</li>
 {[ } ]}
 {[ } ]}
 {[ if (o.nonanonymous) { ]}
 {[ if (o.nonanonymous) { ]}
-<li class="feature" title="{{{ o.__('All other groupchat participants can see your XMPP username') }}}"><span class="fa fa-id-card"></span>{{{ o.__('Not anonymous') }}}</li>
+<li class="feature" title="{{{ o.__('All other groupchat participants can see your XMPP address') }}}"><span class="fa fa-id-card"></span>{{{ o.__('Not anonymous') }}}</li>
 {[ } ]}
 {[ } ]}
 {[ if (o.semianonymous) { ]}
 {[ if (o.semianonymous) { ]}
-<li class="feature" title="{{{ o.__('Only moderators can see your XMPP username') }}}"><span class="fa fa-user-secret"></span>{{{ o.__('Semi-anonymous') }}}</li>
+<li class="feature" title="{{{ o.__('Only moderators can see your XMPP address') }}}"><span class="fa fa-user-secret"></span>{{{ o.__('Semi-anonymous') }}}</li>
 {[ } ]}
 {[ } ]}
 {[ if (o.moderated) { ]}
 {[ if (o.moderated) { ]}
 <li class="feature" title="{{{ o.__('Participants entering this groupchat need to request permission to write') }}}"><span class="fa fa-gavel"></span>{{{ o.__('Moderated') }}}</li>
 <li class="feature" title="{{{ o.__('Participants entering this groupchat need to request permission to write') }}}"><span class="fa fa-gavel"></span>{{{ o.__('Moderated') }}}</li>

+ 1 - 1
src/templates/login_panel.html

@@ -9,7 +9,7 @@
         {[ } else { ]}
         {[ } else { ]}
             {[ if (o.authentication == o.LOGIN || o.authentication == o.EXTERNAL) { ]}
             {[ if (o.authentication == o.LOGIN || o.authentication == o.EXTERNAL) { ]}
                 <div class="form-group">
                 <div class="form-group">
-                    <label for="converse-login-jid">{{{o.__("XMPP Username:")}}}</label>
+                    <label for="converse-login-jid">{{{o.__("XMPP Address:")}}}</label>
                     <input id="converse-login-jid" class="form-control" autofocus required="required" type="text" name="jid" placeholder="{{{o.placeholder_username}}}"/>
                     <input id="converse-login-jid" class="form-control" autofocus required="required" type="text" name="jid" placeholder="{{{o.placeholder_username}}}"/>
                 </div>
                 </div>
                 {[ if (o.authentication !== o.EXTERNAL) { ]}
                 {[ if (o.authentication !== o.EXTERNAL) { ]}