Skip to content

C
converse.js
Commit 00cb015d authored by JC Brand's avatar JC Brand
Browse files
Options

Merge branch 'master' into otr 

Conflicts:
	converse.js
parents 778b8a7c bc971ed8
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1495 additions and 47 deletions
CHANGES.rst
View file @ 00cb015d
Changelog
=========
0.6.2 (Unreleased)
------------------
- French translations. [tdesvenain]
0.6.2 (2013-08-29)
------------------
......
converse.js
View file @ 00cb015d
......@@ -2947,9 +2947,9 @@
template: _.template(
'<form id="converse-login">' +
'<label>'+__('XMPP/Jabber Username:')+'</label>' +
'<input type="text" id="jid">' +
'<input type="username" name="jid">' +
'<label>'+__('Password:')+'</label>' +
'<input type="password" id="password">' +
'<input type="password" name="password">' +
'<input class="login-submit" type="submit" value="'+__('Log In')+'">' +
'</form">'),
......@@ -2974,7 +2974,7 @@
},
initialize: function (cfg) {
cfg.$parent.append(this.$el.html(this.template()));
cfg.$parent.html(this.$el.html(this.template()));
this.$tabs = cfg.$parent.parent().find('#controlbox-tabs');
this.model.on('connection-fail', function () { this.showConnectButton(); }, this);
this.model.on('auth-fail', function () { this.showConnectButton(); }, this);
......@@ -2987,11 +2987,10 @@
},
authenticate: function (ev) {
ev.preventDefault();
var $form = $(ev.target),
$jid_input = $form.find('input#jid'),
$jid_input = $form.find('input[name=jid]'),
jid = $jid_input.val(),
$pw_input = $form.find('input#password'),
$pw_input = $form.find('input[name=password]'),
password = $pw_input.val(),
$bsu_input = null,
errors = false;
......@@ -3014,6 +3013,7 @@
}
if (errors) { return; }
this.connect($form, jid, password);
return false;
},
remove: function () {
......
docs/html/.buildinfo
View file @ 00cb015d
# Sphinx build info version 1
# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
config: 4e01f0b4332cc0ad20271406d2d00beb
config: f3d07787913495cdb19115593573816a
tags: fbb0d17656682115ca4d033fb2f83ba1
docs/html/_sources/index.txt
View file @ 00cb015d
......@@ -602,7 +602,7 @@ You can then create or update the PO file for a specific language by doing the f
::
msgmerge ./locale/af/LC_MESSAGES/converse.po ./locale/converse.pot -U
msgmerge ./locale/de/LC_MESSAGES/converse.po ./locale/converse.pot -U
This PO file is then what gets translated.
......@@ -614,11 +614,11 @@ that we're using.
::
"domain: converse\n"
"lang: af\n"
"lang: de\n"
"plural_forms: nplurals=2; plural=(n != 1);\n"
Unfortunately Jed cannot use the PO files directly. We have to generate from it
Unfortunately `Jed <http://slexaxton.github.io/Jed>`_ cannot use the PO files directly. We have to generate from it
a file in JSON format and then put that in a .js file for the specific
language.
......@@ -633,7 +633,7 @@ You can then convert the translations into JSON format:
::
po2json locale/af/LC_MESSAGES/converse.po locale/af/LC_MESSAGES/converse.json
po2json locale/de/LC_MESSAGES/converse.po locale/de/LC_MESSAGES/converse.json
Now from converse.json paste the data as a value for the "locale_data" key in the
object in the language's .js file.
......@@ -644,7 +644,7 @@ create or update the file ./locale/LC_MESSAGES/de.js with the following code:
::
(function (root, factory) {
define("af", ['jed'], function () {
define("de", ['jed'], function () {
return factory(new Jed({
"domain": "converse",
"locale_data": {
......
docs/html/genindex.html
View file @ 00cb015d
......@@ -9,7 +9,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Index &mdash; Converse.js 0.6.0 documentation</title>
<title>Index &mdash; Converse.js 0.6.2 documentation</title>
<link rel="stylesheet" href="_static/stylesheet.css" type="text/css" />
<link rel="stylesheet" href="_static/pygments.css" type="text/css" />
......@@ -17,7 +17,7 @@
<script type="text/javascript">
var DOCUMENTATION_OPTIONS = {
URL_ROOT: '',
VERSION: '0.6.0',
VERSION: '0.6.2',
COLLAPSE_INDEX: false,
FILE_SUFFIX: '.html',
HAS_SOURCE: true
......@@ -26,7 +26,7 @@
<script type="text/javascript" src="_static/jquery.js"></script>
<script type="text/javascript" src="_static/underscore.js"></script>
<script type="text/javascript" src="_static/doctools.js"></script>
<link rel="top" title="Converse.js 0.6.0 documentation" href="index.html" />
<link rel="top" title="Converse.js 0.6.2 documentation" href="index.html" />
</head>
<body>
<div id="header_wrap" class="outer">
......@@ -51,7 +51,7 @@
<li class="right" style="margin-right: 10px">
<a href="#" title="General Index"
accesskey="I">index</a></li>
<li><a href="index.html">Converse.js 0.6.0 documentation</a> &raquo;</li>
<li><a href="index.html">Converse.js 0.6.2 documentation</a> &raquo;</li>
</ul>
</div>
<section id="main_content" class="inner">
......@@ -80,7 +80,7 @@
<li class="right" style="margin-right: 10px">
<a href="#" title="General Index"
>index</a></li>
<li><a href="index.html">Converse.js 0.6.0 documentation</a> &raquo;</li>
<li><a href="index.html">Converse.js 0.6.2 documentation</a> &raquo;</li>
</ul>
</div>
</div>
......
docs/html/index.html
View file @ 00cb015d
......@@ -7,7 +7,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Quickstart (to get a demo up and running) &mdash; Converse.js 0.6.0 documentation</title>
<title>Quickstart (to get a demo up and running) &mdash; Converse.js 0.6.2 documentation</title>
<link rel="stylesheet" href="_static/stylesheet.css" type="text/css" />
<link rel="stylesheet" href="_static/pygments.css" type="text/css" />
......@@ -15,7 +15,7 @@
<script type="text/javascript">
var DOCUMENTATION_OPTIONS = {
URL_ROOT: '',
VERSION: '0.6.0',
VERSION: '0.6.2',
COLLAPSE_INDEX: false,
FILE_SUFFIX: '.html',
HAS_SOURCE: true
......@@ -24,7 +24,7 @@
<script type="text/javascript" src="_static/jquery.js"></script>
<script type="text/javascript" src="_static/underscore.js"></script>
<script type="text/javascript" src="_static/doctools.js"></script>
<link rel="top" title="Converse.js 0.6.0 documentation" href="#" />
<link rel="top" title="Converse.js 0.6.2 documentation" href="#" />
</head>
<body>
<div id="header_wrap" class="outer">
......@@ -49,7 +49,7 @@
<li class="right" style="margin-right: 10px">
<a href="genindex.html" title="General Index"
accesskey="I">index</a></li>
<li><a href="#">Converse.js 0.6.0 documentation</a> &raquo;</li>
<li><a href="#">Converse.js 0.6.2 documentation</a> &raquo;</li>
</ul>
</div>
<section id="main_content" class="inner">
......@@ -550,7 +550,7 @@ function like so:</p>
<div class="highlight-python"><pre>make pot</pre>
</div>
<p>You can then create or update the PO file for a specific language by doing the following:</p>
<div class="highlight-python"><pre>msgmerge ./locale/af/LC_MESSAGES/converse.po ./locale/converse.pot -U</pre>
<div class="highlight-python"><pre>msgmerge ./locale/de/LC_MESSAGES/converse.po ./locale/converse.pot -U</pre>
</div>
<p>This PO file is then what gets translated.</p>
<p>If you&#8217;ve created a new PO file, please make sure to add the following
......@@ -558,11 +558,11 @@ attributes at the top of the file (under <em>Content-Transfer-Encoding</em>). Th
required as configuration settings for Jed, the Javascript translations library
that we&#8217;re using.</p>
<div class="highlight-python"><div class="highlight"><pre><span class="s">&quot;domain: converse</span><span class="se">\n</span><span class="s">&quot;</span>
<span class="s">&quot;lang: af</span><span class="se">\n</span><span class="s">&quot;</span>
<span class="s">&quot;lang: de</span><span class="se">\n</span><span class="s">&quot;</span>
<span class="s">&quot;plural_forms: nplurals=2; plural=(n != 1);</span><span class="se">\n</span><span class="s">&quot;</span>
</pre></div>
</div>
<p>Unfortunately Jed cannot use the PO files directly. We have to generate from it
<p>Unfortunately <a class="reference external" href="http://slexaxton.github.io/Jed">Jed</a> cannot use the PO files directly. We have to generate from it
a file in JSON format and then put that in a .js file for the specific
language.</p>
<p>To generate JSON from a PO file, you&#8217;ll need po2json for node.js. Run the
......@@ -570,14 +570,14 @@ following command to install it (npm being the node.js package manager):</p>
<div class="highlight-python"><pre>npm install po2json</pre>
</div>
<p>You can then convert the translations into JSON format:</p>
<div class="highlight-python"><pre>po2json locale/af/LC_MESSAGES/converse.po locale/af/LC_MESSAGES/converse.json</pre>
<div class="highlight-python"><pre>po2json locale/de/LC_MESSAGES/converse.po locale/de/LC_MESSAGES/converse.json</pre>
</div>
<p>Now from converse.json paste the data as a value for the &#8220;locale_data&#8221; key in the
object in the language&#8217;s .js file.</p>
<p>So, if you are for example translating into German (language code &#8216;de&#8217;), you&#8217;ll
create or update the file ./locale/LC_MESSAGES/de.js with the following code:</p>
<div class="highlight-python"><pre>(function (root, factory) {
define("af", ['jed'], function () {
define("de", ['jed'], function () {
return factory(new Jed({
"domain": "converse",
"locale_data": {
......@@ -613,7 +613,7 @@ those hoops you had to jump through.</p>
<li class="right" style="margin-right: 10px">
<a href="genindex.html" title="General Index"
>index</a></li>
<li><a href="#">Converse.js 0.6.0 documentation</a> &raquo;</li>
<li><a href="#">Converse.js 0.6.2 documentation</a> &raquo;</li>
</ul>
</div>
</div>
......
docs/html/objects.inv
View file @ 00cb015d
# Sphinx inventory version 2
# Project: Converse.js
# Version: 0.6.0
# Version: 0.6.2
# The remainder of this file is compressed using zlib.
xm
{"];
......
docs/html/search.html
View file @ 00cb015d
......@@ -7,7 +7,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Search &mdash; Converse.js 0.6.0 documentation</title>
<title>Search &mdash; Converse.js 0.6.2 documentation</title>
<link rel="stylesheet" href="_static/stylesheet.css" type="text/css" />
<link rel="stylesheet" href="_static/pygments.css" type="text/css" />
......@@ -15,7 +15,7 @@
<script type="text/javascript">
var DOCUMENTATION_OPTIONS = {
URL_ROOT: '',
VERSION: '0.6.0',
VERSION: '0.6.2',
COLLAPSE_INDEX: false,
FILE_SUFFIX: '.html',
HAS_SOURCE: true
......@@ -25,7 +25,7 @@
<script type="text/javascript" src="_static/underscore.js"></script>
<script type="text/javascript" src="_static/doctools.js"></script>
<script type="text/javascript" src="_static/searchtools.js"></script>
<link rel="top" title="Converse.js 0.6.0 documentation" href="index.html" />
<link rel="top" title="Converse.js 0.6.2 documentation" href="index.html" />
<script type="text/javascript">
jQuery(function() { Search.loadIndex("searchindex.js"); });
</script>
......@@ -55,7 +55,7 @@
<li class="right" style="margin-right: 10px">
<a href="genindex.html" title="General Index"
accesskey="I">index</a></li>
<li><a href="index.html">Converse.js 0.6.0 documentation</a> &raquo;</li>
<li><a href="index.html">Converse.js 0.6.2 documentation</a> &raquo;</li>
</ul>
</div>
<section id="main_content" class="inner">
......@@ -100,7 +100,7 @@
<li class="right" style="margin-right: 10px">
<a href="genindex.html" title="General Index"
>index</a></li>
<li><a href="index.html">Converse.js 0.6.0 documentation</a> &raquo;</li>
<li><a href="index.html">Converse.js 0.6.2 documentation</a> &raquo;</li>
</ul>
</div>
</div>
......
docs/html/searchindex.js
View file @ 00cb015d
This diff is collapsed.
docs/source/index.rst
View file @ 00cb015d
......@@ -602,7 +602,7 @@ You can then create or update the PO file for a specific language by doing the f
::
msgmerge ./locale/af/LC_MESSAGES/converse.po ./locale/converse.pot -U
msgmerge ./locale/de/LC_MESSAGES/converse.po ./locale/converse.pot -U
This PO file is then what gets translated.
......@@ -614,11 +614,11 @@ that we're using.
::
"domain: converse\n"
"lang: af\n"
"lang: de\n"
"plural_forms: nplurals=2; plural=(n != 1);\n"
Unfortunately Jed cannot use the PO files directly. We have to generate from it
Unfortunately `Jed <http://slexaxton.github.io/Jed>`_ cannot use the PO files directly. We have to generate from it
a file in JSON format and then put that in a .js file for the specific
language.
......@@ -633,7 +633,7 @@ You can then convert the translations into JSON format:
::
po2json locale/af/LC_MESSAGES/converse.po locale/af/LC_MESSAGES/converse.json
po2json locale/de/LC_MESSAGES/converse.po locale/de/LC_MESSAGES/converse.json
Now from converse.json paste the data as a value for the "locale_data" key in the
object in the language's .js file.
......@@ -644,7 +644,7 @@ create or update the file ./locale/LC_MESSAGES/de.js with the following code:
::
(function (root, factory) {
define("af", ['jed'], function () {
define("de", ['jed'], function () {
return factory(new Jed({
"domain": "converse",
"locale_data": {
......
index.html
View file @ 00cb015d
......@@ -54,7 +54,7 @@
<li>Custom status messages</li>
<li>Typing notifications</li>
<li>Third person messages (/me )</li>
<li>Translated into multiple languages (af, de, es, it, pt-BR)</li>
<li>Translated into multiple languages (af, de, es, fr, it, pt-BR)</li>
</ul>
<h2>Screencasts</h2>
......@@ -198,7 +198,7 @@
bosh_service_url: 'https://bind.opkode.im', // Please use this connection manager only for testing purposes
debug: true ,
hide_muc_server: false,
i18n: locales['fr'], // Refer to ./locale/locales.js to see which locales are supported
i18n: locales['en'], // Refer to ./locale/locales.js to see which locales are supported
prebind: false,
show_controlbox_by_default: true,
xhr_user_search: false,
......
locale/fr/LC_MESSAGES/converse.json 0 → 100644
View file @ 00cb015d
This diff is collapsed.
locale/fr/LC_MESSAGES/converse.po 0 → 100644
View file @ 00cb015d
This diff is collapsed.
locale/fr/LC_MESSAGES/fr.js 0 → 100644
View file @ 00cb015d
This diff is collapsed.
locale/locales.js
View file @ 00cb015d
......@@ -10,9 +10,10 @@
paths: {
"jed": "components/jed/jed",
"af": "locale/af/LC_MESSAGES/af",
"de": "locale/de/LC_MESSAGES/de",
"en": "locale/en/LC_MESSAGES/en",
"es": "locale/es/LC_MESSAGES/es",
"de": "locale/de/LC_MESSAGES/de",
"fr": "locale/fr/LC_MESSAGES/fr",
"it": "locale/it/LC_MESSAGES/it",
"pt_BR": "locale/pt_BR/LC_MESSAGES/pt_BR"
}
......@@ -21,17 +22,19 @@
define("locales", [
'jed',
'af',
'de',
'en',
'es',
'de',
"it",
"pt_BR"
], function (jed, af, en, es, de, it, pt_BR) {
'fr',
'it',
'pt_BR'
], function (jed, af, de, en, es, fr, it, pt_BR) {
root.locales = {
'af': af,
'de': de,
'en': en,
'es': es,
'de': de,
'fr': fr,
'it': it,
'pt-br': pt_BR
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7