Author: hugo
Date: 2006-06-06 10:22:53 -0500 (Tue, 06 Jun 2006)
New Revision: 3091
Added:
django/trunk/django/contrib/admin/media/css/base_rtl.css
django/trunk/django/contrib/admin/media/css/login_rtl.css
Modified:
django/trunk/django/contrib/admin/templates/admin/base.html
django/trunk/django/contrib/admin/templates/admin/login.html
django/trunk/django/core/context_processors.py
django/trunk/docs/i18n.txt
Log:
fixed #2089: added language bidirectional support and updated the admin to use
it. thanks [EMAIL PROTECTED]
Added: django/trunk/django/contrib/admin/media/css/base_rtl.css
===================================================================
--- django/trunk/django/contrib/admin/media/css/base_rtl.css 2006-06-06
15:13:16 UTC (rev 3090)
+++ django/trunk/django/contrib/admin/media/css/base_rtl.css 2006-06-06
15:22:53 UTC (rev 3091)
@@ -0,0 +1,5 @@
[EMAIL PROTECTED] url('base.css');
+
+body {
+ direction: rtl;
+}
Added: django/trunk/django/contrib/admin/media/css/login_rtl.css
===================================================================
--- django/trunk/django/contrib/admin/media/css/login_rtl.css 2006-06-06
15:13:16 UTC (rev 3090)
+++ django/trunk/django/contrib/admin/media/css/login_rtl.css 2006-06-06
15:22:53 UTC (rev 3091)
@@ -0,0 +1,7 @@
[EMAIL PROTECTED] url('login.css');
[EMAIL PROTECTED] url('base_rtl.css');
[EMAIL PROTECTED] url('layout_rtl.css');
+
+.login .form-row { float:right; }
+.login .form-row label { float:right; padding-left:0.5em; padding-right:0;
text-align:left;}
+.login .submit-row { clear:both; padding:1em 9.4em 0 0; }
Modified: django/trunk/django/contrib/admin/templates/admin/base.html
===================================================================
--- django/trunk/django/contrib/admin/templates/admin/base.html 2006-06-06
15:13:16 UTC (rev 3090)
+++ django/trunk/django/contrib/admin/templates/admin/base.html 2006-06-06
15:22:53 UTC (rev 3091)
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml"; lang="{{ LANGUAGE_CODE }}"
xml:lang="{{ LANGUAGE_CODE }}">
<head>
<title>{% block title %}{% endblock %}</title>
-<link rel="stylesheet" type="text/css" href="{% block stylesheet %}{% load
adminmedia %}{% admin_media_prefix %}css/base.css{% endblock %}" />
+<link rel="stylesheet" type="text/css" href="{% block stylesheet %}{% load
adminmedia %}{% admin_media_prefix %}css/base{% if LANGUAGE_BIDI %}_rtl{% endif
%}.css{% endblock %}" />
{% block extrastyle %}{% endblock %}
{% block extrahead %}{% endblock %}
</head>
Modified: django/trunk/django/contrib/admin/templates/admin/login.html
===================================================================
--- django/trunk/django/contrib/admin/templates/admin/login.html
2006-06-06 15:13:16 UTC (rev 3090)
+++ django/trunk/django/contrib/admin/templates/admin/login.html
2006-06-06 15:22:53 UTC (rev 3091)
@@ -1,7 +1,7 @@
{% extends "admin/base_site.html" %}
{% load i18n %}
-{% block stylesheet %}{% load adminmedia %}{% admin_media_prefix
%}css/login.css{% endblock %}
+{% block stylesheet %}{% load adminmedia %}{% admin_media_prefix %}css/login{%
if LANGUAGE_BIDI %}_rtl{% endif %}.css{% endblock %}
{% block bodyclass %}login{% endblock %}
{% block content_title %}{% endblock %}
{% block breadcrumbs %}{% endblock %}
Modified: django/trunk/django/core/context_processors.py
===================================================================
--- django/trunk/django/core/context_processors.py 2006-06-06 15:13:16 UTC
(rev 3090)
+++ django/trunk/django/core/context_processors.py 2006-06-06 15:22:53 UTC
(rev 3091)
@@ -36,6 +36,10 @@
context_extras['LANGUAGE_CODE'] = request.LANGUAGE_CODE
else:
context_extras['LANGUAGE_CODE'] = settings.LANGUAGE_CODE
+
+ from django.utils import translation
+ context_extras['LANGUAGE_BIDI'] = translation.get_language_bidi()
+
return context_extras
def request(request):
Modified: django/trunk/docs/i18n.txt
===================================================================
--- django/trunk/docs/i18n.txt 2006-06-06 15:13:16 UTC (rev 3090)
+++ django/trunk/docs/i18n.txt 2006-06-06 15:22:53 UTC (rev 3091)
@@ -230,12 +230,17 @@
language code and the second is the language name (in that language).
* ``LANGUAGE_CODE`` is the current user's preferred language, as a string.
Example: ``en-us``. (See "How language preference is discovered", below.)
+ * ``LANGUAGE_BIDI`` is the current language's direction. If True, it's a
+ right-to-left language, e.g: Hebrew, Arabic. If False it's a
+ left-to-right language, e.g: English, French, German etc.
+
If you don't use the ``RequestContext`` extension, you can get those values
with
-two tags::
+three tags::
{% get_current_language as LANGUAGE_CODE %}
{% get_available_languages as LANGUAGES %}
+ {% get_current_language_bidi as LANGUAGE_BIDI %}
These tags also require a ``{% load i18n %}``.
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/django-updates
-~----------~----~----~----~------~----~------~--~---
