Merge branch 'master' into roster_refactor

Conflicts:
	locale/en/LC_MESSAGES/converse.po

.gitignore

@@ -21,6 +21,7 @@ Backbone.Overview
 tags
 stamp-npm
 stamp-bower
+stamp-bundler
 
 # Sphinx
 docs/html

Makefile

@@ -6,7 +6,8 @@ PHANTOMJS       ?= ./node_modules/.bin/phantomjs
 SPHINXBUILD     ?= ./bin/sphinx-build
 SPHINXOPTS      =
 PO2JSON         ?= ./node_modules/.bin/po2json
-SASS            ?= sass 
+SASS            ?= ./.bundle/bin/sass
+BUNDLE          ?= ./.bundle/bin/bundle
 GRUNT           ?= ./node_modules/.bin/grunt
 HTTPSERVE		?= ./node_modules/.bin/http-server
 
@@ -15,31 +16,34 @@ ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) ./d
 # the i18n builder cannot share the environment and doctrees with the others
 I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) ./docs/source
 
-.PHONY: all help clean html epub changes linkcheck gettext po pot po2json merge release css minjs build
-
-all: dev
+.PHONY: all help clean html epub changes linkcheck gettext po pot po2json merge release css minjs build dev-ruby
 
 help:
-	@echo "Please use \`make <target>' where <target> is one of the following"
-	@echo "  build      create minified builds containing converse.js and all its dependencies"
-	@echo "  changes    make an overview of all changed/added/deprecated items added to the documentation"
-	@echo "  css        generate CSS from the Sass files"
-	@echo "  dev        set up the development environment"
-	@echo "  epub       export the documentation to epub"
-	@echo "  gettext    make PO message catalogs of the documentation"
-	@echo "  html       make standalone HTML files of the documentation"
-	@echo "  linkcheck  check all documentation external links for integrity"
-	@echo "  cssmin     minify the CSS files"
-	@echo "  po         generate gettext PO files for each i18n language"
-	@echo "  po2json    generate JSON files from the language PO files"
-	@echo "  pot        generate a gettext POT file to be used for translations"
-	@echo "  release    make a new minified release"
-	@echo "  serve      serve this directory via a webserver on port 8000"
+	@echo "Please use \`make <target>' where <target> is one of the following:"
+	@echo ""
+	@echo " all        A synonym for 'make dev'."
+	@echo " build      Create minified builds of converse.js and all its dependencies."
+	@echo " changes    Make an overview of all changed/added/deprecated items added to the documentation."
+	@echo " css        Generate CSS from the Sass files."
+	@echo " cssmin     Minify the CSS files."
+	@echo " dev        Set up the development environment. To force a fresh start, run 'make clean' first."
+	@echo " epub       Export the documentation to epub."
+	@echo " gettext    Make PO message catalogs of the documentation."
+	@echo " html       Make standalone HTML files of the documentation."
+	@echo " linkcheck  Check all documentation external links for integrity."
+	@echo " po         Generate gettext PO files for each i18n language."
+	@echo " po2json    Generate JSON files from the language PO files."
+	@echo " pot        Generate a gettext POT file to be used for translations."
+	@echo " release    Make a new minified release."
+	@echo " serve      Serve this directory via a webserver on port 8000."
+	@echo " watch      Tells Sass to watch the .scss files for changes and then automatically update the CSS files."
+
+all: dev
 
 ########################################################################
 ## Miscellaneous
 
-serve: dev
+serve: stamp-npm
 	$(HTTPSERVE) -p 8000
 
 ########################################################################
@@ -84,28 +88,34 @@ stamp-bower: stamp-npm bower.json
 	$(BOWER) install
 	touch stamp-bower
 
+stamp-bundler:
+	mkdir -p .bundle
+	gem install --user bundler --bindir .bundle/bin
+	$(BUNDLE) install --path .bundle --binstubs .bundle/bin
+	touch stamp-bundler
+
 clean::
-	rm -f stamp-npm stamp-bower
-	rm -rf node_modules components
+	rm -f stamp-npm stamp-bower stamp-bundler
+	rm -rf node_modules components .bundle
 
-dev: clean
-	npm install
-	$(BOWER) update;
-	bundle install --path=~/
+dev: stamp-bower stamp-bundler
 
 ########################################################################
 ## Builds
 
-css::
-	$(SASS) sass/converse.scss > css/converse.css
+css:: dev-ruby
+	$(SASS) -I .bundle/bin sass/converse.scss css/converse.css
+
+watch:: dev-ruby
+	$(SASS) --watch -I .bundle/bin sass/converse.scss:css/converse.css
 
 jsmin:
 	./node_modules/requirejs/bin/r.js -o src/build.js && ./node_modules/requirejs/bin/r.js -o src/build-no-locales-no-otr.js && ./node_modules/requirejs/bin/r.js -o src/build-no-otr.js && ./node_modules/requirejs/bin/r.js -o src/build-website.js
 
-cssmin:
+cssmin: stamp-npm
 	$(GRUNT) cssmin
 
-build::
+build:: stamp-npm
 	$(GRUNT) jst
 	$(GRUNT) minify
 

README.rst

@@ -33,7 +33,7 @@ It has the following features:
 * Messages appear in all connnected chat clients `XEP 280 <http://xmpp.org/extensions/xep-0280.html>`_
 * Typing and chat state notifications `XEP 85 <http://xmpp.org/extensions/xep-0085.html>`_
 * Third person messages (/me )
-* Translated into 15 languages
+* Translated into 16 languages
 * Off-the-record encryption
 
 -----------

bower.json

 {
   "name": "converse.js",
   "description": "Web-based XMPP/Jabber chat client written in javascript",
-  "version": "0.9.2",
+  "version": "0.9.3",
   "license": "MPL",
   "devDependencies": {
     "jasmine": "https://github.com/jcbrand/jasmine.git#1_3_x",

builds/templates.js

@@ -431,7 +431,7 @@ __p += '\n<div class="input-group">\n    <input name="' +
 ((__t = (name)) == null ? '' : __t) +
 '" type="' +
 ((__t = (type)) == null ? '' : __t) +
-'" \n        ';
+'"\n        ';
  if (value) { ;
 __p += ' value="' +
 ((__t = (value)) == null ? '' : __t) +
@@ -441,7 +441,9 @@ __p += '\n        ';
  if (required) { ;
 __p += ' class="required" ';
  } ;
-__p += ' />\n    <span>' +
+__p += ' />\n    <span title="' +
+((__t = (domain)) == null ? '' : __t) +
+'">' +
 ((__t = (domain)) == null ? '' : __t) +
 '</span>\n</div>\n';
 
@@ -479,15 +481,38 @@ return __p
 
 this["templates"]["login_panel"] = function(obj) {
 obj || (obj = {});
-var __t, __p = '', __e = _.escape;
+var __t, __p = '', __e = _.escape, __j = Array.prototype.join;
+function print() { __p += __j.call(arguments, '') }
 with (obj) {
-__p += '<form id="converse-login" method="post">\n    <label>' +
+__p += '<form id="converse-login" method="post">\n    ';
+ if (auto_login) { ;
+__p += '\n        <span class="spinner login-submit"/>\n    ';
+ } ;
+__p += '\n    ';
+ if (!auto_login) { ;
+__p += '\n        ';
+ if (authentication == LOGIN) { ;
+__p += '\n            <label>' +
 ((__t = (label_username)) == null ? '' : __t) +
-'</label>\n    <input type="email" name="jid" placeholder="user@server">\n    <label>' +
+'</label>\n            <input name="jid" placeholder="user@server">\n            <label>' +
 ((__t = (label_password)) == null ? '' : __t) +
-'</label>\n    <input type="password" name="password" placeholder="password">\n    <input class="submit" type="submit" value="' +
+'</label>\n            <input type="password" name="password" placeholder="password">\n            <input class="submit" type="submit" value="' +
 ((__t = (label_login)) == null ? '' : __t) +
-'">\n    <span class="conn-feedback"></span>\n</form>\n';
+'">\n            <span class="conn-feedback"></span>\n        ';
+ } ;
+__p += '\n        ';
+ if (authentication == ANONYMOUS) { ;
+__p += '\n            <input type="submit" class="submit login-anon" value="' +
+((__t = (label_anon_login)) == null ? '' : __t) +
+'"/>\n        ';
+ } ;
+__p += '\n        ';
+ if (authentication == PREBIND) { ;
+__p += '\n            <p>Disconnected.</p>\n        ';
+ } ;
+__p += '\n    ';
+ } ;
+__p += '\n</form>\n';
 
 }
 return __p

css/converse.css

@@ -1260,3 +1260,5 @@
     margin-left: 0;
     cursor: n-resize;
     z-index: 20; }
+
+/*# sourceMappingURL=converse.css.map */

docs/CHANGES.rst

 Changelog
 =========
 
-0.9.3 (Undefined)
------------------
+0.9.3 (2015-05-01)
+------------------
 
 * Add the ability to log in anonymously. [jcbrand]
 * Add the ability to log in automatically. [jcbrand]
 * Remove ``type=email`` from JID field in login form. Resulting validation error confuses people. [jcbrand]
+* Add Ukranian translations [Andriy Kopystyansky]
 * #344 Enable the path to the sound files to be configured [thierrytiti and jcbrand]
 * #370 Unable to register a new user to ejabberd 2.1.11. [gbonvehi]
 * #372 Some offline users have a visible empty <dd> in the roster. [floriancargoet]

docs/source/conf.py

@@ -48,9 +48,9 @@ copyright = u'2014, JC Brand'
 # built documents.
 #
 # The short X.Y version.
-version = '0.9.2'
+version = '0.9.3'
 # The full version, including alpha/beta/rc tags.
-release = '0.9.2'
+release = '0.9.3'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

docs/source/development.rst

@@ -34,6 +34,9 @@ Also make sure you have ``Git`` installed. `Details <http://git-scm.com/book/en/
 .. note::
     Windows users should use Chocolatey as recommended above.:
 
+.. note::
+    Debian & Ubuntu users : apt-get install git npm nodejs-legacy
+
 Once you have *Node.js* and *git* installed, run the following command inside the Converse.js
 directory:
 

index.html

@@ -151,7 +151,7 @@
                             <li>Custom status messages</li>
                             <li>Typing notifications</li>
                             <li>Third person messages (/me )</li>
-                            <li>Translated into 15 languages</li>
+                            <li>Translated into 16 languages</li>
                             <li>Off-the-record encryption
                         </ul>
                 </div>

locale/af/LC_MESSAGES/converse.json

@@ -8,7 +8,7 @@
          },
          " e.g. conversejs.org": [
             null,
-            ""
+            "bv. conversejs.org"
          ],
          "unencrypted": [
             null,
@@ -16,7 +16,7 @@
          ],
          "unverified": [
             null,
-            "ongeverifieer"
+            "onbevestig"
          ],
          "verified": [
             null,
@@ -50,6 +50,10 @@
             null,
             "Hierdie persoon is afwesig"
          ],
+         "Click to hide these contacts": [
+            null,
+            "Kliek om hierdie kontakte te verskuil"
+         ],
          "My contacts": [
             null,
             "My kontakte"
@@ -108,11 +112,11 @@
          ],
          "Authentication request from %1$s\n\nYour chat contact is attempting to verify your identity, by asking you the question below.\n\n%2$s": [
             null,
-            "Verifieeringsversoek van  %1$s\n\nU gespreksmaat probeer om u identiteit te verifieer, deur die volgende vraag te vra \n\n%2$s"
+            "Identiteitbevestigingsversoek van  %1$s\n\nU gespreksmaat probeer om u identiteit te bevestig, deur die volgende vraag te vra \n\n%2$s"
          ],
          "Could not verify this user's identify.": [
             null,
-            "Kon nie hierdie gebruiker se identitied verifieer nie."
+            "Kon nie hierdie gebruiker se identitied bevestig nie."
          ],
          "Exchanging private key with contact.": [
             null,
@@ -138,6 +142,10 @@
             null,
             "het opgehou tik"
          ],
+         "has gone away": [
+            null,
+            "het weggegaan"
+         ],
          "Show this menu": [
             null,
             "Vertoon hierdie keuselys"
@@ -172,7 +180,7 @@
          ],
          "You will be prompted to provide a security question and then an answer to that question.\n\nYour contact will then be prompted the same question and if they type the exact same answer (case sensitive), their identity will be verified.": [
             null,
-            "Daar sal van u verwag word om 'n sekuriteitsvraag te stel, en dan ook die antwoord tot daardie vraag te verskaf.\n\nU gespreksmaat sal dan daardie vraag gestel word, en indien hulle presies dieselfde antwoord (lw. hoofletters tel) verskaf, sal hul identiteit geverifieer wees."
+            "Daar sal van u verwag word om 'n sekuriteitsvraag te stel, en dan ook die antwoord tot daardie vraag te verskaf.\n\nU gespreksmaat sal dan daardie vraag gestel word, en indien hulle presies dieselfde antwoord (lw. hoofletters tel) verskaf, sal hul identiteit bevestig wees."
          ],
          "What is your security question?": [
             null,
@@ -186,6 +194,14 @@
             null,
             "Ongeldige verifikasiemetode verskaf"
          ],
+         "has gone offline": [
+            null,
+            "is nou aflyn"
+         ],
+         "is busy": [
+            null,
+            "is besig"
+         ],
          "Your messages are not encrypted anymore": [
             null,
             "U boodskappe is nie meer versleutel nie"
@@ -196,7 +212,7 @@
          ],
          "Your contact's identify has been verified.": [
             null,
-            "U gespreksmaat se identiteit is geverifieer."
+            "U gespreksmaat se identiteit is bevestig."
          ],
          "Your contact has ended encryption on their end, you should do the same.": [
             null,
@@ -212,7 +228,7 @@
          ],
          "Your messages are encrypted and your contact verified.": [
             null,
-            "U boodskappe is versleutel en u gespreksmaat se identiteit geverifieer."
+            "U boodskappe is versleutel en u gespreksmaat se identiteit bevestig."
          ],
          "Your contact has closed their end of the private session, you should do the same": [
             null,
@@ -244,11 +260,11 @@
          ],
          "Verify with fingerprints": [
             null,
-            "Verifieer met vingerafdrukke"
+            "Bevestig met vingerafdrukke"
          ],
          "Verify with SMP": [
             null,
-            "Verifieer met SMP"
+            "Bevestig met SMP"
          ],
          "What's this?": [
             null,
@@ -270,6 +286,10 @@
             null,
             "Afgemeld"
          ],
+         "Log out": [
+            null,
+            "Meld af"
+         ],
          "Contact name": [
             null,
             "Kontaknaam"
@@ -314,6 +334,10 @@
             null,
             "Bediener"
          ],
+         "Join Room": [
+            null,
+            "Betree kamer"
+         ],
          "Show rooms": [
             null,
             "Wys kamers"
@@ -438,6 +462,10 @@
             null,
             "Verban gebruiker uit hierdie kletskamer"
          ],
+         "Change user role to participant": [
+            null,
+            "Verander gebruikersrol na deelnemer"
+         ],
          "Kick user from room": [
             null,
             "Skop gebruiker uit hierdie kletskamer"
@@ -448,7 +476,7 @@
          ],
          "Grant membership to a user": [
             null,
-            ""
+            "Verleen lidmaatskap aan 'n gebruiker"
          ],
          "Remove user's ability to post messages": [
             null,
@@ -460,11 +488,15 @@
          ],
          "Grant moderator role to user": [
             null,
-            ""
+            "Verleen moderator rol aan gebruiker"
+         ],
+         "Grant ownership of this room": [
+            null,
+            "Verleen eienaarskap van hierdie kamer"
          ],
          "Revoke user's membership": [
             null,
-            ""
+            "Herroep gebruiker se lidmaatskap"
          ],
          "Set room topic": [
             null,
@@ -562,6 +594,10 @@
             null,
             "<strong>%1$s</strong> is verban"
          ],
+         "<strong>%1$s</strong>'s nickname has changed": [
+            null,
+            "<strong>%1$s</strong> se bynaam het verander"
+         ],
          "<strong>%1$s</strong> has been kicked out": [
             null,
             "<strong>%1$s</strong> is uitgeskop"
@@ -638,6 +674,14 @@
             null,
             "Kliek om hierdie kontak te verwyder"
          ],
+         "Click to accept this contact request": [
+            null,
+            "Kliek om hierdie kontakversoek te aanvaar"
+         ],
+         "Click to decline this contact request": [
+            null,
+            "Kliek om hierdie kontakversoek te weier"
+         ],
          "Click to chat with this contact": [
             null,
             "Kliek om met hierdie kontak te klets"
@@ -742,6 +786,10 @@
             null,
             "Wagwoord"
          ],
+         "Click here to log in anonymously": [
+            null,
+            "Kliek hier om anoniem aan te meld"
+         ],
          "Log In": [
             null,
             "Meld aan"

locale/de/LC_MESSAGES/converse.json

@@ -9,23 +9,23 @@
          },
          " e.g. conversejs.org": [
             null,
-            ""
+            "z. B. conversejs.org"
          ],
          "unencrypted": [
             null,
-            ""
+            "unverschlüsselt"
          ],
          "unverified": [
             null,
-            ""
+            "unbestätigt"
          ],
          "verified": [
             null,
-            ""
+            "bestätigt"
          ],
          "finished": [
             null,
-            ""
+            "erledigt"
          ],
          "This contact is busy": [
             null,
@@ -51,6 +51,10 @@
             null,
             "Dieser Kontakt ist abwesend"
          ],
+         "Click to hide these contacts": [
+            null,
+            "Hier klicken um diesen Kontakte zu verstecken"
+         ],
          "My contacts": [
             null,
             "Meine Kontakte"
@@ -391,6 +395,10 @@
             null,
             ""
          ],
+         "Occupants": [
+            null,
+            "Teilnehmer"
+         ],
          "You are about to invite %1$s to the chat room \"%2$s\". ": [
             null,
             ""
@@ -411,10 +419,22 @@
             null,
             ""
          ],
+         "Ban user from room": [
+            null,
+            "Verbanne einen Benutzer aus dem Raum."
+         ],
          "Change user role to participant": [
             null,
             ""
          ],
+         "Kick user from room": [
+            null,
+            "Werfe einen Benutzer aus dem Raum."
+         ],
+         "Write in 3rd person": [
+            null,
+            "In der dritten Person schreiben"
+         ],
          "Grant membership to a user": [
             null,
             ""
@@ -435,6 +455,10 @@
             null,
             ""
          ],
+         "Set room topic": [
+            null,
+            "Chatraum Thema festlegen"
+         ],
          "Allow muted user to post messages": [
             null,
             ""
@@ -673,12 +697,16 @@
          ],
          "Return": [
             null,
-            ""
+            "Zurück"
          ],
          "The provider rejected your registration attempt. ": [
             null,
             ""
          ],
+         "XMPP Username:": [
+            null,
+            "XMPP Benutzername"
+         ],
          "Password:": [
             null,
             "Passwort:"

main.js

@@ -79,6 +79,7 @@ require.config({
         "pl":        "locale/pl/LC_MESSAGES/converse.json",
         "pt_BR":     "locale/pt_BR/LC_MESSAGES/converse.json",
         "ru":        "locale/ru/LC_MESSAGES/converse.json",
+        "uk":        "locale/uk/LC_MESSAGES/converse.json",
         "zh":        "locale/zh/LC_MESSAGES/converse.json",
 
         // Templates

package.json

 {
   "name": "converse.js",
-  "version": "0.9.2",
+  "version": "0.9.3",
   "description": "Browser based XMPP instant messaging client",
   "main": "main.js",
   "directories": {

src/locales.js

@@ -21,6 +21,7 @@
         'text!pl',
         'text!pt_BR',
         'text!ru',
+        'text!uk',
         'text!zh'
         ], function ($, Jed) {
             root.locales = {
@@ -39,7 +40,8 @@
                 'pl':     arguments[14],
                 'pt-br':  arguments[15],
                 'ru':     arguments[16],
-                'zh':     arguments[17]
+                'uk':     arguments[17],
+                'zh':     arguments[18]
             };
             return root.locales;
         });