Merge branch 'missed-string' into development

This commit is contained in:
James Socol 2010-04-26 18:36:02 -07:00
Родитель 0695295292 06167d9144
Коммит 7178812e7d
4 изменённых файлов: 10 добавлений и 3 удалений

3
.gitmodules поставляемый Normal file
Просмотреть файл

@ -0,0 +1,3 @@
[submodule "locale"]
path = locale
url = git://github.com/jsocol/sumo-locales.git

Просмотреть файл

@ -26,7 +26,7 @@
<div class="search-count">
{# L10n: {n} is the number of search results, {q} is the search query, {l} is the language searched. #}
{{ ngettext('Found <strong>{n}</strong> result for <strong>{q}</strong> in <strongL>{l}</strong>',
{{ ngettext('Found <strong>{n}</strong> result for <strong>{q}</strong> in <strong>{l}</strong>',
'Found <strong>{n}</strong> results for <strong>{q}</strong> in <strong>{l}</strong>',
num_results)|fe(n=num_results, q=q, l=lang_name) }}
</div>

1
locale Submodule

@ -0,0 +1 @@
Subproject commit e645f9062e1077c858c155f1330ab87c3a5056ab

Просмотреть файл

@ -13,6 +13,8 @@ LOG_LEVEL = logging.DEBUG
ROOT = os.path.dirname(os.path.abspath(__file__))
path = lambda *a: os.path.join(ROOT, *a)
ROOT_PACKAGE = os.path.basename(ROOT)
ADMINS = (
# ('Your Name', 'your_email@domain.com'),
)
@ -71,7 +73,7 @@ LANGUAGES = dict([(i.lower(), LOCALES[i].native)
LANGUAGE_URL_MAP = dict([(i.lower(), i) for i in SUMO_LANGUAGES])
TEXT_DOMAIN = 'k-messages'
TEXT_DOMAIN = 'messages'
SITE_ID = 1
SITE_TITLE = _lazy(u'Firefox Support', 'site_title')
@ -135,7 +137,7 @@ AUTHENTICATION_BACKENDS = (
'sumo.backends.SessionBackend', # TODO: Replace with Kitsune auth.
)
ROOT_URLCONF = 'kitsune.urls'
ROOT_URLCONF = '%s.urls' % ROOT_PACKAGE
TEMPLATE_DIRS = (
# Put strings here, like "/home/html/django_templates"
@ -152,6 +154,7 @@ INSTALLED_APPS = (
'django.contrib.messages',
'tower',
'jingo_minify',
ROOT_PACKAGE,
'sumo',
'search',
)