Commits

Mark Lavin  committed 731dbcf Merge

Merge in latest stable fixes.

  • Participants
  • Parent commits 7a40719, 82ab739

Comments (0)

Files changed (8)

 4597983758f1b174c40c0a5c279952925d8d3085 version-0.5.1
 26ccd03bdadc78c1861f63baff3bd9f401f58e5b version-0.5.2
 dd1cea7ff57aaf8610b6dbcb2caf64619bd687ab version-0.6.0
+7a0836ffd427952ba31958dd097c49667d0e8880 version-0.6.1

File docs/conf.py

 # The short X.Y version.
 version = '0.6'
 # The full version, including alpha/beta/rc tags.
-release = '0.6.0'
+release = '0.6.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

File docs/releases.rst

 Release Notes
 ==================
 
+
+v0.6.1 (Released 2012-10-13)
+--------------------------------------
+
+Features
+_________________
+
+- Added Polish translation. Thanks to Sławomir Ehlert.
+
+Bug Fixes
+_________________
+
+- Fixed incompatibility with jQuery UI 1.9.
+
+
 v0.6.0 (Released 2012-10-09)
 --------------------------------------
 

File selectable/__init__.py

 "Auto-complete selection widgets using Django and jQuery UI."
 
 
-__version__ = '0.6.0'
+__version__ = '0.6.1'

File selectable/locale/pl/LC_MESSAGES/django.mo

Binary file added.

File selectable/locale/pl/LC_MESSAGES/django.po

+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+#   <slafs.e@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: django-selectable\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-10-06 15:02-0400\n"
+"PO-Revision-Date: 2012-10-11 12:50+0000\n"
+"Last-Translator: slafs <slafs.e@gmail.com>\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/django-selectable/language/pl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: base.py:115
+msgid "Show more results"
+msgstr "Pokaż więcej wyników"
+
+#: forms/fields.py:19 forms/fields.py:63
+msgid "Select a valid choice. That choice is not one of the available choices."
+msgstr "Dokonaj poprawnego wyboru. Ten wybór nie jest jednym z dostępnych."

File selectable/static/selectable/js/jquery.dj.selectable.js

                 $(input).data('page', null);
                 ul.zIndex(this.element.zIndex() + 1);
                 this._renderMenu(ul, items);
-                this.menu.deactivate();
+                // jQuery UI menu does not define deactivate 
+                if (this.menu.deactivate) this.menu.deactivate();
                 this.menu.refresh();
                 // size and position menu
                 ul.show();

File selectable/tests/qunit/index.html

     <title>Django Selectable Qunit Test Suite</title>
     <link rel="stylesheet" href="qunit.css" type="text/css" media="screen" />
     <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
-    <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.23/jquery-ui.min.js"></script>
+    <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.24/jquery-ui.min.js"></script>
     <script type="text/javascript" src="qunit.js"></script>
     <script>
         // Disable auto-binding of djselectable widgets to avoid test race conditions
         });
         test("item selection", function() {
             bindSelectables('#combobox-initial');
-            var input = $('#id_autocomplete-initial');
+            var input = $('#id_combobox-initial');
             ok(input.val(), 'Initial', "initial text value should not be lost");
             var item = {id: "1", value: 'foo'};
             input.djselectable('select', item);