x/tuskar-ui
Code Issues Proposed changes

Corrected bugs introduced in internationalization

Browse Source
This commit is contained in:
Jeffrey Wilcox 2011-06-03 13:40:37 +09:00
parent c02123f644
commit e82235c616
39 changed files with 48 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.bzrignore
View File

@ -5,6 +5,7 @@ django-openstack/downloads/
django-openstack/eggs/ django-openstack/eggs/
django-openstack/parts/ django-openstack/parts/
django-openstack/src/django_nova.egg-info django-openstack/src/django_nova.egg-info
django-openstack/src/django_openstack.egg-info
django-nova-syspanel/src/django_nova_syspanel.egg-info django-nova-syspanel/src/django_nova_syspanel.egg-info
openstack-dashboard/.dashboard-venv openstack-dashboard/.dashboard-venv
openstack-dashboard/local/dashboard_openstack.sqlite3 openstack-dashboard/local/dashboard_openstack.sqlite3

1
django-nova-syspanel/src/django_nova_syspanel/templates/django_nova_syspanel/cloudview/index.html
View File

@ -1,4 +1,5 @@
{% extends "base.html" %} {% extends "base.html" %}
{% load i18n %}
{% block breadcrumb %}{{ block.super }}<li><a href="{% url syspanel_cloudview %}">Cloud View</a></li>{% endblock %} {% block breadcrumb %}{{ block.super }}<li><a href="{% url syspanel_cloudview %}">Cloud View</a></li>{% endblock %}

1
django-nova-syspanel/src/django_nova_syspanel/templates/django_nova_syspanel/index.html
View File

@ -1,4 +1,5 @@
{% extends "base.html" %} {% extends "base.html" %}
{% load i18n %}
{% block content %} {% block content %}
<h2 class="page_heading">NASA Nebula System Panel</h2> <h2 class="page_heading">NASA Nebula System Panel</h2>

1
django-nova-syspanel/src/django_nova_syspanel/templates/django_nova_syspanel/instances/index.html
View File

@ -1,4 +1,5 @@
{% extends "base.html" %} {% extends "base.html" %}
{% load i18n %}
{% block headerjs %} {% block headerjs %}

1
django-nova-syspanel/src/django_nova_syspanel/templates/django_nova_syspanel/security/disable_project_credentials.html
View File

@ -1,4 +1,5 @@
{% extends "base.html" %} {% extends "base.html" %}
{% load i18n %}
{% block breadcrumb %}{{ block.super }}<li><a href="{% url syspanel_security %}">Security</a></li>{% endblock %} {% block breadcrumb %}{{ block.super }}<li><a href="{% url syspanel_security %}">Security</a></li>{% endblock %}

1
django-nova-syspanel/src/django_nova_syspanel/templates/django_nova_syspanel/security/index.html
View File

@ -1,4 +1,5 @@
{% extends "base.html" %} {% extends "base.html" %}
{% load i18n %}
{% block breadcrumb %}{{ block.super }}<li><a href="{% url syspanel_security %}">Security</a></li>{% endblock %} {% block breadcrumb %}{{ block.super }}<li><a href="{% url syspanel_security %}">Security</a></li>{% endblock %}

1
django-nova-syspanel/src/django_nova_syspanel/templates/django_nova_syspanel/volumes/index.html
View File

@ -1,4 +1,5 @@
{% extends "base.html" %} {% extends "base.html" %}
{% load i18n %}
{% block headerjs %} {% block headerjs %}

1
django-nova-syspanel/src/django_nova_syspanel/templates/django_nova_syspanel/vpns/index.html
View File

@ -1,4 +1,5 @@
{% extends "base.html" %} {% extends "base.html" %}
{% load i18n %}
{% block headerjs %} {% block headerjs %}

1
django-openstack/src/django_openstack/templates/admin/django_openstack/nova/project/delete_project.html
View File

@ -1,4 +1,5 @@
{% extends "admin/change_list.html" %} {% extends "admin/change_list.html" %}
{% load i18n %}
{% block extrastyle %} {% block extrastyle %}
{{block.super}} {{block.super}}

1
django-openstack/src/django_openstack/templates/admin/django_openstack/nova/project/delete_project_user.html
View File

@ -1,4 +1,5 @@
{% extends "admin/change_list.html" %} {% extends "admin/change_list.html" %}
{% load i18n %}
{% block extrastyle %} {% block extrastyle %}
{{block.super}} {{block.super}}

2
django-openstack/src/django_openstack/templates/admin/django_openstack/nova/project/project_user.html
View File

@ -1,5 +1,5 @@
{% extends "admin/django_openstack/nova/project/base_projects.html" %} {% extends "admin/django_openstack/nova/project/base_projects.html" %}
{% load admin_modify adminmedia %} {% load admin_modify adminmedia i18n %}
{% block extrahead %} {% block extrahead %}
{{ block.super }} {{ block.super }}

2
django-openstack/src/django_openstack/templates/django_openstack/nova/credentials/expired.html
View File

@ -1,4 +1,4 @@
{% load django_openstack_tags %} {% load django_openstack_tags i18n %}
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en" xml:lang="en"> <html lang="en" xml:lang="en">
<head> <head>

1
django-openstack/src/django_openstack/templates/django_openstack/nova/images/_list.html
View File

@ -1,3 +1,4 @@
{% load i18n %}
<h3 class="image_list_heading"> {{ heading }} </h3> <h3 class="image_list_heading"> {{ heading }} </h3>
{% if images %} {% if images %}
<table id="image_launch"> <table id="image_launch">

1
django-openstack/src/django_openstack/templates/django_openstack/nova/images/base.html
View File

@ -1,5 +1,4 @@
{% extends "django_openstack/nova/base.html" %} {% extends "django_openstack/nova/base.html" %}
{% load i18n %}
{% load sidebar_tags %} {% load sidebar_tags %}
{% block nav_projects %} {% block nav_projects %}

1
django-openstack/src/django_openstack/templates/django_openstack/nova/images/edit.html
View File

@ -1,4 +1,5 @@
{% extends "django_openstack/nova/images/base.html" %} {% extends "django_openstack/nova/images/base.html" %}
{% load i18n %}
{% block title %} - Cloud Computing{% endblock %} {% block title %} - Cloud Computing{% endblock %}

3
django-openstack/src/django_openstack/templates/django_openstack/nova/images/index.html
View File

@ -1,6 +1,7 @@
{% extends "django_openstack/nova/images/base.html" %} {% extends "django_openstack/nova/images/base.html" %}
{% load i18n %}
{% block title %} - Launch an Image" %}{% endblock %} {% block title %} - {% trans "Launch an Image" %}{% endblock %}
{% block headerjs %} {% block headerjs %}
<script type="text/javascript" src="/media/django_openstack/js/jquery.form.js"></script> <script type="text/javascript" src="/media/django_openstack/js/jquery.form.js"></script>

1
django-openstack/src/django_openstack/templates/django_openstack/nova/images/launch.html
View File

@ -1,4 +1,5 @@
{% extends "django_openstack/nova/images/base.html" %} {% extends "django_openstack/nova/images/base.html" %}
{% load i18n %}
{% block title %} - Cloud Computing{% endblock %} {% block title %} - Cloud Computing{% endblock %}

1
django-openstack/src/django_openstack/templates/django_openstack/nova/instances/_instances_list.html
View File

@ -1,3 +1,4 @@
{% load i18n %}
{% if instances %} {% if instances %}
<table style="width: 100%"> <table style="width: 100%">
<tr> <tr>

1
django-openstack/src/django_openstack/templates/django_openstack/nova/instances/detail_list.html
View File

@ -1,4 +1,5 @@
{% extends "django_openstack/nova/instances/base.html" %} {% extends "django_openstack/nova/instances/base.html" %}
{% load i18n %}
{% block title %} - Cloud Computing{% endblock %} {% block title %} - Cloud Computing{% endblock %}

1
django-openstack/src/django_openstack/templates/django_openstack/nova/instances/edit.html
View File

@ -1,4 +1,5 @@
{% extends "django_openstack/nova/instances/base.html" %} {% extends "django_openstack/nova/instances/base.html" %}
{% load i18n %}
{% block title %} - Cloud Computing{% endblock %} {% block title %} - Cloud Computing{% endblock %}

1
django-openstack/src/django_openstack/templates/django_openstack/nova/instances/index.html
View File

@ -1,4 +1,5 @@
{% extends "django_openstack/nova/instances/base.html" %} {% extends "django_openstack/nova/instances/base.html" %}
{% load i18n %}
{% block title %} - {{ project.projectname|capfirst }} Instances{% endblock %} {% block title %} - {{ project.projectname|capfirst }} Instances{% endblock %}
{% block pageclass %}instances{% endblock %} {% block pageclass %}instances{% endblock %}

1
django-openstack/src/django_openstack/templates/django_openstack/nova/instances/performance.html
View File

@ -1,4 +1,5 @@
{% extends "django_openstack/nova/instances/base.html" %} {% extends "django_openstack/nova/instances/base.html" %}
{% load i18n %}
{% block title %} - Cloud Computing{% endblock %} {% block title %} - Cloud Computing{% endblock %}

1
django-openstack/src/django_openstack/templates/django_openstack/nova/keypairs/_list.html
View File

@ -1,3 +1,4 @@
{% load i18n %}
{% if keypairs %} {% if keypairs %}
<table style="width: 100%"> <table style="width: 100%">
<tr> <tr>

1
django-openstack/src/django_openstack/templates/django_openstack/nova/keypairs/index.html
View File

@ -1,4 +1,5 @@
{% extends "django_openstack/nova/keypairs/base.html" %} {% extends "django_openstack/nova/keypairs/base.html" %}
{% load i18n %}
{% block title %} - Cloud Computing{% endblock %} {% block title %} - Cloud Computing{% endblock %}

1
django-openstack/src/django_openstack/templates/django_openstack/nova/projects/edit_user.html
View File

@ -1,4 +1,5 @@
{% extends "django_openstack/nova/base.html" %} {% extends "django_openstack/nova/base.html" %}
{% load i18n %}
{% block title %} - {{ project.projectname|capfirst }} Overview{% endblock %} {% block title %} - {{ project.projectname|capfirst }} Overview{% endblock %}
{% block pageclass %}overview{% endblock %} {% block pageclass %}overview{% endblock %}

1
django-openstack/src/django_openstack/templates/django_openstack/nova/projects/index.html
View File

@ -1,4 +1,5 @@
{% extends "django_openstack/nova/base.html" %} {% extends "django_openstack/nova/base.html" %}
{% load i18n %}
{% block title %} - {{ project.projectname|capfirst }} Overview{% endblock %} {% block title %} - {{ project.projectname|capfirst }} Overview{% endblock %}
{% block pageclass %}overview{% endblock %} {% block pageclass %}overview{% endblock %}

1
django-openstack/src/django_openstack/templates/django_openstack/nova/projects/manage.html
View File

@ -1,4 +1,5 @@
{% extends "django_openstack/nova/base.html" %} {% extends "django_openstack/nova/base.html" %}
{% load i18n %}
{% block title %} - {{ project.projectname|capfirst }} Overview{% endblock %} {% block title %} - {{ project.projectname|capfirst }} Overview{% endblock %}
{% block pageclass %}overview{% endblock %} {% block pageclass %}overview{% endblock %}

1
django-openstack/src/django_openstack/templates/django_openstack/nova/securitygroups/detail.html
View File

@ -1,4 +1,5 @@
{% extends "django_openstack/nova/securitygroups/base.html" %} {% extends "django_openstack/nova/securitygroups/base.html" %}
{% load i18n %}
{% block title %} - Cloud Computing{% endblock %} {% block title %} - Cloud Computing{% endblock %}

1
django-openstack/src/django_openstack/templates/django_openstack/nova/securitygroups/index.html
View File

@ -1,4 +1,5 @@
{% extends "django_openstack/nova/securitygroups/base.html" %} {% extends "django_openstack/nova/securitygroups/base.html" %}
{% load i18n %}
{% block title %} - Cloud Computing{% endblock %} {% block title %} - Cloud Computing{% endblock %}

1
django-openstack/src/django_openstack/templates/django_openstack/nova/volumes/index.html
View File

@ -1,4 +1,5 @@
{% extends "django_openstack/nova/volumes/base.html" %} {% extends "django_openstack/nova/volumes/base.html" %}
{% load i18n %}
{% block title %} - Cloud Computing{% endblock %} {% block title %} - Cloud Computing{% endblock %}

1
openstack-dashboard/dashboard/templates/403.html
View File

@ -1,4 +1,5 @@
{% extends "base.html" %} {% extends "base.html" %}
{% load i18n %}
{% block title %} - Forbidden{% endblock %} {% block title %} - Forbidden{% endblock %}

1
openstack-dashboard/dashboard/templates/404.html
View File

@ -1,4 +1,5 @@
{% extends "base.html" %} {% extends "base.html" %}
{% load i18n %}
{% block title %} - {% trans "Page Not Found" %}{% endblock %} {% block title %} - {% trans "Page Not Found" %}{% endblock %}

1
openstack-dashboard/dashboard/templates/500.html
View File

@ -1,4 +1,5 @@
{% extends "base.html" %} {% extends "base.html" %}
{% load i18n %}
{% block title %} - Internal Server Error{% endblock %} {% block title %} - Internal Server Error{% endblock %}

3
openstack-dashboard/dashboard/templates/admin/index.html
View File

@ -1,6 +1,5 @@
{% extends "admin/base_site.html" %} {% extends "admin/base_site.html" %}
{% load i18n %} {% load django_openstack_tags i18n %}
{% load django_openstack_tags %}
{% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% load adminmedia %}{% admin_media_prefix %}css/dashboard.css" />{% endblock %} {% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% load adminmedia %}{% admin_media_prefix %}css/dashboard.css" />{% endblock %}

3
openstack-dashboard/dashboard/templates/base-root.html
View File

@ -1,5 +1,4 @@
{% load django_openstack_tags %} {% load django_openstack_tags i18n %}
{% load i18n %}
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en" xml:lang="en"> <html lang="en" xml:lang="en">
<head> <head>

11
openstack-dashboard/dashboard/templates/index.html
View File

@ -1,5 +1,5 @@
{% extends "base.html" %} {% extends "base.html" %}
{% load django_openstack_tags %} {% load django_openstack_tags i18n %}
{% block headercss %} {% block headercss %}
{% endblock %} {% endblock %}
@ -34,6 +34,15 @@
</div> </div>
<div class="home_block"> <div class="home_block">
<form action="/i18n/setlang/" method="post"> {% csrf_token %}
<select name="language">
{% get_language_info_list for LANGUAGES as languages %}
{% for language in languages %}
<option value="{{ language.code }}">{{ language.name_local }} ({{ language.code }})</option>
{% endfor %}
</select>
<input type="submit" value="Go" />
</form>
<h3>OpenStack Resources</h3> <h3>OpenStack Resources</h3>
<ul> <ul>
<li><a href="http://openstack.org" target="_blank">OpenStack.org</a></li> <li><a href="http://openstack.org" target="_blank">OpenStack.org</a></li>

1
openstack-dashboard/dashboard/templates/permission_denied.html
View File

@ -1,4 +1,5 @@
{% extends "base.html" %} {% extends "base.html" %}
{% load i18n %}
{% block title %} - {% trans "Permission Denied"%}{% endblock %} {% block title %} - {% trans "Permission Denied"%}{% endblock %}

1
openstack-dashboard/dashboard/templates/unavailable.html
View File

@ -1,4 +1,5 @@
{% extends "base.html" %} {% extends "base.html" %}
{% load i18n %}
{% block title %} - {% trans "Service Unavailable"%}{% endblock %} {% block title %} - {% trans "Service Unavailable"%}{% endblock %}
{% block pageclass %}unavailable{% endblock %} {% block pageclass %}unavailable{% endblock %}

1
openstack-dashboard/dashboard/urls.py
View File

@ -31,6 +31,7 @@ admin.autodiscover()
urlpatterns = patterns('', urlpatterns = patterns('',
url(r'^$', 'dashboard.views.index', name='index'), url(r'^$', 'dashboard.views.index', name='index'),
url(r'^i18n/', include('django.conf.urls.i18n')),
url(r'^accounts/register/$', url(r'^accounts/register/$',
'registration.views.register', 'registration.views.register',
{'form_class': reg_forms.RegistrationFormUniqueEmail}, {'form_class': reg_forms.RegistrationFormUniqueEmail},