Skip to content

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

Merge branch 'master' into otr 

Conflicts:
	locale/af/LC_MESSAGES/converse.po
	locale/converse.pot
parents 00cb015d 84915290
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1911 additions and 1027 deletions
CHANGES.rst
View file @ d402ed8e
Changelog
=========
0.6.2 (Unreleased)
0.6.3 (2013-09-12)
------------------
NB: This release contains an important security fix. Please don't use older
versions of the 0.6.x branch.
- French translations. [tdesvenain]
- Bugfix: Messages were stored against buddy JID and not own JID. [jcbrand]
0.6.2 (2013-08-29)
------------------
......
Makefile
View file @ d402ed8e
......@@ -37,6 +37,10 @@ help:
pot:
xgettext --keyword=__ --keyword=___ --from-code=UTF-8 --output=locale/converse.pot converse.js --package-name=Converse.js --copyright-holder="Jan-Carel Brand" --package-version=0.4 -c --language="python";
merge:
find ./locale -maxdepth 1 -mindepth 1 -type d -exec msgmerge {}/LC_MESSAGES/converse.po ./locale/converse.pot -U \;
release:
r.js -o build.js
......
bower.json
View file @ d402ed8e
{
"name": "converse",
"version": "0.6.2",
"version": "0.6.3",
"devDependencies": {
"jasmine": "https://github.com/jcbrand/jasmine.git#1_3_x"
},
......
build.js
View file @ d402ed8e
......@@ -11,6 +11,7 @@
"en": "locale/en/LC_MESSAGES/en",
"de": "locale/de/LC_MESSAGES/de",
"es": "locale/es/LC_MESSAGES/es",
"fr": "locale/fr/LC_MESSAGES/fr",
"it": "locale/it/LC_MESSAGES/it",
"pt_BR": "locale/pt_BR/LC_MESSAGES/pt_BR",
"jquery.tinysort": "components/tinysort/src/jquery.tinysort",
......
converse.js
View file @ d402ed8e
......@@ -307,7 +307,7 @@
}
this.messages = new converse.Messages();
this.messages.localStorage = new Backbone.LocalStorage(
hex_sha1('converse.messages'+this.get('jid')));
hex_sha1('converse.messages'+this.get('jid')+converse.bare_jid));
this.set({
'user_id' : Strophe.getNodeFromJid(this.get('jid')),
'box_id' : hex_sha1(this.get('jid')),
......@@ -3063,7 +3063,7 @@
// Set up the roster
this.roster = new this.RosterItems();
this.roster.localStorage = new Backbone.LocalStorage(
hex_sha1('converse.rosteritems-'+this.bare_jid));
hex_sha1('converse.rosteritems-'+converse.bare_jid));
this.connection.roster.registerCallback(
$.proxy(this.roster.rosterHandler, this.roster),
null, 'presence', null);
......
converse.min.css
View file @ d402ed8e
This source diff could not be displayed because it is too large. You can view the blob instead.
converse.min.js
View file @ d402ed8e
This diff is collapsed.
docs/html/.buildinfo
View file @ d402ed8e
# 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: f3d07787913495cdb19115593573816a
config: 4abaaaa6bef0f75cddeaa4264cba9630
tags: fbb0d17656682115ca4d033fb2f83ba1
docs/html/_sources/index.txt
View file @ d402ed8e
......@@ -604,7 +604,13 @@ You can then create or update the PO file for a specific language by doing the f
msgmerge ./locale/de/LC_MESSAGES/converse.po ./locale/converse.pot -U
This PO file is then what gets translated.
To do this for ALL languages, run:
::
make merge
The resulting PO file is then what gets translated.
If you've created a new PO file, please make sure to add the following
attributes at the top of the file (under *Content-Transfer-Encoding*). They are
......
docs/html/genindex.html
View file @ d402ed8e
......@@ -9,7 +9,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Index &mdash; Converse.js 0.6.2 documentation</title>
<title>Index &mdash; Converse.js 0.6.3 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.2',
VERSION: '0.6.3',
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.2 documentation" href="index.html" />
<link rel="top" title="Converse.js 0.6.3 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.2 documentation</a> &raquo;</li>
<li><a href="index.html">Converse.js 0.6.3 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.2 documentation</a> &raquo;</li>
<li><a href="index.html">Converse.js 0.6.3 documentation</a> &raquo;</li>
</ul>
</div>
</div>
......
docs/html/index.html
View file @ d402ed8e
......@@ -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.2 documentation</title>
<title>Quickstart (to get a demo up and running) &mdash; Converse.js 0.6.3 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.2',
VERSION: '0.6.3',
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.2 documentation" href="#" />
<link rel="top" title="Converse.js 0.6.3 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.2 documentation</a> &raquo;</li>
<li><a href="#">Converse.js 0.6.3 documentation</a> &raquo;</li>
</ul>
</div>
<section id="main_content" class="inner">
......@@ -552,7 +552,10 @@ function like so:</p>
<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/de/LC_MESSAGES/converse.po ./locale/converse.pot -U</pre>
</div>
<p>This PO file is then what gets translated.</p>
<p>To do this for ALL languages, run:</p>
<div class="highlight-python"><pre>make merge</pre>
</div>
<p>The resulting 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
attributes at the top of the file (under <em>Content-Transfer-Encoding</em>). They are
required as configuration settings for Jed, the Javascript translations library
......@@ -613,7 +616,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.2 documentation</a> &raquo;</li>
<li><a href="#">Converse.js 0.6.3 documentation</a> &raquo;</li>
</ul>
</div>
</div>
......
docs/html/objects.inv
View file @ d402ed8e
# Sphinx inventory version 2
# Project: Converse.js
# Version: 0.6.2
# Version: 0.6.3
# The remainder of this file is compressed using zlib.
xm
{"];
......
docs/html/search.html
View file @ d402ed8e
......@@ -7,7 +7,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Search &mdash; Converse.js 0.6.2 documentation</title>
<title>Search &mdash; Converse.js 0.6.3 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.2',
VERSION: '0.6.3',
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.2 documentation" href="index.html" />
<link rel="top" title="Converse.js 0.6.3 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.2 documentation</a> &raquo;</li>
<li><a href="index.html">Converse.js 0.6.3 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.2 documentation</a> &raquo;</li>
<li><a href="index.html">Converse.js 0.6.3 documentation</a> &raquo;</li>
</ul>
</div>
</div>
......
docs/html/searchindex.js
View file @ d402ed8e
This diff is collapsed.
docs/source/conf.py
View file @ d402ed8e
......@@ -48,9 +48,9 @@ copyright = u'2013, JC Brand'
# built documents.
#
# The short X.Y version.
version = '0.6.2'
version = '0.6.3'
# The full version, including alpha/beta/rc tags.
release = '0.6.2'
release = '0.6.3'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
......
docs/source/index.rst
View file @ d402ed8e
......@@ -604,7 +604,13 @@ You can then create or update the PO file for a specific language by doing the f
msgmerge ./locale/de/LC_MESSAGES/converse.po ./locale/converse.pot -U
This PO file is then what gets translated.
To do this for ALL languages, run:
::
make merge
The resulting PO file is then what gets translated.
If you've created a new PO file, please make sure to add the following
attributes at the top of the file (under *Content-Transfer-Encoding*). They are
......
index.html
View file @ d402ed8e
......@@ -19,8 +19,8 @@
<h1 id="project_title"><a href="http://conversejs.org">Converse.js</a></h1>
<h2 id="project_tagline">An XMPP chat client for your website</h2>
<section id="downloads">
<a class="zip_download_link" href="https://github.com/jcbrand/converse.js/archive/v0.6.2.zip">Download the latest release as a .zip file</a>
<a class="tar_download_link" href="https://github.com/jcbrand/converse.js/archive/v0.6.2.tar.gz">Download the latest release as a tar.gz file</a>
<a class="zip_download_link" href="https://github.com/jcbrand/converse.js/archive/v0.6.3.zip">Download the latest release as a .zip file</a>
<a class="tar_download_link" href="https://github.com/jcbrand/converse.js/archive/v0.6.3.tar.gz">Download the latest release as a tar.gz file</a>
</section>
</header>
</div>
......
locale/converse.pot
View file @ d402ed8e
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Converse.js 0.4\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-09-10 23:27+0200\n"
"POT-Creation-Date: 2013-09-12 20:57+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......
locale/de/LC_MESSAGES/converse.po
View file @ d402ed8e
This diff is collapsed.
locale/en/LC_MESSAGES/converse.po
View file @ d402ed8e
This diff is collapsed.
locale/es/LC_MESSAGES/converse.po
View file @ d402ed8e
This diff is collapsed.
locale/fr/LC_MESSAGES/converse.po
View file @ d402ed8e
This diff is collapsed.
locale/it/LC_MESSAGES/converse.po
View file @ d402ed8e
This diff is collapsed.
locale/pt_BR/LC_MESSAGES/converse.po
View file @ d402ed8e
This diff is collapsed.
package.json
View file @ d402ed8e
{
"name": "converse.js",
"version": "0.6.2",
"version": "0.6.3",
"description": "Browser based XMPP instant messaging client",
"main": "main.js",
"directories": {
......
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