Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also .

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also .
Choose a Base Repository
mozilla/bedrock
l-hedgehog/bedrock
6a68/bedrock
AaronMT/bedrock
Acidburn0zzz/bedrock
Devil399/bedrock
DonnieThomas/bedrock
Elideb/bedrock
Inkbug/bedrock
J0WI/bedrock
JefferyQ/bedrock
JohnMyHello/bedrock
JorgenJuel/bedrock
JuliRash/bedrock
Korcia/bedrock
Lrn2Tej/bedrock
MariagraziaAlastra/bedrock
MarzWorldLit/bedrock
Meghashyamt/bedrock
MetAnkit/bedrock
MichealAbaho/bedrock
NitikaAgarwal/bedrock
Osmose/bedrock
PinZhang/bedrock
Prithvirajbilla/bedrock
RiteshBhat/bedrock
RubyMoonProductionCo/bedrock
Sancus/bedrock
Saurabh1/bedrock
Shondhi/bedrock
SujaySKumar/bedrock
SuvaRastafarian/bedrock
TheoChevalier/bedrock
Wyatt78/bedrock
abcde12345678/bedrock
abijithpradeep/bedrock
adityaputra/bedrock
akatsoulas/bedrock
alexgibson/bedrock
alfredboyd/bedrock
alicelieutier/bedrock
almet/bedrock
amuntner/bedrock
andrewhayward/bedrock
aniketalhat/bedrock
anushbmx/bedrock
aplohman/bedrock
apurva2342/bedrock
arischs/bedrock
auzelac91/bedrock
bensternthal/bedrock
billgujie/bedrock
bingdow/bedrock
blackjk3/bedrock
bobsilverberg/bedrock
brianking/bedrock
caddycarine/bedrock
callahad/bedrock
charleswaddell/bedrock
chrismore/bedrock
chrispauciello/bedrock
cinemascop89/bedrock
ckprice/bedrock
cordial-emily/bedrock
craigcook/bedrock
crhrabal/bedrock
cturra/bedrock
daaray/bedrock
dad7732/bedrock
darkowlzz/bedrock
darkwing/bedrock
davidwboswell/bedrock
dblamont/bedrock
dmcrock/bedrock
ehsan/bedrock
einBambi/bedrock
elin-moco/bedrock
ethertank/bedrock
ezio-auditore/bedrock
fakedarren/bedrock
flodolo/bedrock
fmarier/bedrock
fossbalaji/bedrock
fwenzel/bedrock
gautha91/bedrock
gauthierm/bedrock
gavinsharp/bedrock
gkoberger/bedrock
glogiotatidis/bedrock
gobelinus/bedrock
groovecoder/bedrock
gueroJeff/bedrock
h4ck3rm1k3/bedrock
hainp/bedrock
hardfire/bedrock
heavensmile/bedrock
hfeeki/bedrock
hoosteeno/bedrock
icaaq/bedrock
indygreg/bedrock
ironman7/bedrock
irvin/bedrock
isaacgrant/bedrock
jasager/bedrock
jbuck/bedrock
jeremenichelli/bedrock
jff006/bedrock
jgasteiz/bedrock
jgmize/bedrock
jlongster/bedrock
jonathanbhaskar/bedrock
joshua-s/bedrock
josiah2595/bedrock
jpetto/bedrock
jsocol/bedrock
keithburgoyne/bedrock
kesavanm/bedrock
kewisch/bedrock
konarkmodi/bedrock
kpavlovsky/bedrock
kumarabhi457/bedrock
kyoshino/bedrock
landsurveyorsunited/bedrock
lazybean/bedrock
liyousheng/bedrock
lmandel/bedrock
lmorchard/bedrock
m-alexis/bedrock
mahinthjoe/bedrock
marcoos/bedrock
mello151/bedrock
milossh/bedrock
mkmelin/bedrock
mmkmou/bedrock
mnoorenberghe/bedrock
monicachew/bedrock
morgamic/bedrock
mpizza/bedrock
mythmon/bedrock
nburka/bedrock
nicolasmota/bedrock
ojorgensen/bedrock
onstash/bedrock
openjck/bedrock
pascalchevrel/bedrock
patilswapnilv/bedrock
petemoore/bedrock
petercpg/bedrock
plounze/bedrock
pmclanahan/bedrock
poglesbyg/bedrock
pombredanne/bedrock
pooozaa/bedrock
ppapadeas/bedrock
prakashkut/bedrock
purvi24/bedrock
quakpac/bedrock
quangquach/bedrock
reedloden/bedrock
retornam/bedrock
rik/bedrock
riverspirit/bedrock
rlr/bedrock
romil93/bedrock
rosanardila/bedrock
rossbruniges/bedrock
rtnpro/bedrock
rubenvereecken/bedrock
ryanfeeley/bedrock
saa14/bedrock
sashakruglov/bedrock
schalkneethling/bedrock
sgarrity/bedrock
shansm/bedrock
shawnl/bedrock
sinjiewang/bedrock
smillaedler/bedrock
sshepanski7/bedrock
stephendesroches/bedrock
sudheesh001/bedrock
sun19881209/bedrock
superduper/bedrock
sylvesterwillis/bedrock
sylvestre/bedrock
tbm/bedrock
theodorocaliari/bedrock
tikimaster/bedrock
tonychung/bedrock
trishasalas/bedrock
tsharman/bedrock
v1ka5/bedrock
vborrego/bedrock
viduthalai1947/bedrock
vinothrao/bedrock
xiaoxiao880919/bedrock
xxczaki/bedrock
xzryxz/bedrock-moz
yh453926638/bedrock
yingtaiGithub/bedrock
yjw2288/bedrock
Nothing to show
...
Choose a Head Repository
mozilla/bedrock
l-hedgehog/bedrock
6a68/bedrock
AaronMT/bedrock
Acidburn0zzz/bedrock
Devil399/bedrock
DonnieThomas/bedrock
Elideb/bedrock
Inkbug/bedrock
J0WI/bedrock
JefferyQ/bedrock
JohnMyHello/bedrock
JorgenJuel/bedrock
JuliRash/bedrock
Korcia/bedrock
Lrn2Tej/bedrock
MariagraziaAlastra/bedrock
MarzWorldLit/bedrock
Meghashyamt/bedrock
MetAnkit/bedrock
MichealAbaho/bedrock
NitikaAgarwal/bedrock
Osmose/bedrock
PinZhang/bedrock
Prithvirajbilla/bedrock
RiteshBhat/bedrock
RubyMoonProductionCo/bedrock
Sancus/bedrock
Saurabh1/bedrock
Shondhi/bedrock
SujaySKumar/bedrock
SuvaRastafarian/bedrock
TheoChevalier/bedrock
Wyatt78/bedrock
abcde12345678/bedrock
abijithpradeep/bedrock
adityaputra/bedrock
akatsoulas/bedrock
alexgibson/bedrock
alfredboyd/bedrock
alicelieutier/bedrock
almet/bedrock
amuntner/bedrock
andrewhayward/bedrock
aniketalhat/bedrock
anushbmx/bedrock
aplohman/bedrock
apurva2342/bedrock
arischs/bedrock
auzelac91/bedrock
bensternthal/bedrock
billgujie/bedrock
bingdow/bedrock
blackjk3/bedrock
bobsilverberg/bedrock
brianking/bedrock
caddycarine/bedrock
callahad/bedrock
charleswaddell/bedrock
chrismore/bedrock
chrispauciello/bedrock
cinemascop89/bedrock
ckprice/bedrock
cordial-emily/bedrock
craigcook/bedrock
crhrabal/bedrock
cturra/bedrock
daaray/bedrock
dad7732/bedrock
darkowlzz/bedrock
darkwing/bedrock
davidwboswell/bedrock
dblamont/bedrock
dmcrock/bedrock
ehsan/bedrock
einBambi/bedrock
elin-moco/bedrock
ethertank/bedrock
ezio-auditore/bedrock
fakedarren/bedrock
flodolo/bedrock
fmarier/bedrock
fossbalaji/bedrock
fwenzel/bedrock
gautha91/bedrock
gauthierm/bedrock
gavinsharp/bedrock
gkoberger/bedrock
glogiotatidis/bedrock
gobelinus/bedrock
groovecoder/bedrock
gueroJeff/bedrock
h4ck3rm1k3/bedrock
hainp/bedrock
hardfire/bedrock
heavensmile/bedrock
hfeeki/bedrock
hoosteeno/bedrock
icaaq/bedrock
indygreg/bedrock
ironman7/bedrock
irvin/bedrock
isaacgrant/bedrock
jasager/bedrock
jbuck/bedrock
jeremenichelli/bedrock
jff006/bedrock
jgasteiz/bedrock
jgmize/bedrock
jlongster/bedrock
jonathanbhaskar/bedrock
joshua-s/bedrock
josiah2595/bedrock
jpetto/bedrock
jsocol/bedrock
keithburgoyne/bedrock
kesavanm/bedrock
kewisch/bedrock
konarkmodi/bedrock
kpavlovsky/bedrock
kumarabhi457/bedrock
kyoshino/bedrock
landsurveyorsunited/bedrock
lazybean/bedrock
liyousheng/bedrock
lmandel/bedrock
lmorchard/bedrock
m-alexis/bedrock
mahinthjoe/bedrock
marcoos/bedrock
mello151/bedrock
milossh/bedrock
mkmelin/bedrock
mmkmou/bedrock
mnoorenberghe/bedrock
monicachew/bedrock
morgamic/bedrock
mpizza/bedrock
mythmon/bedrock
nburka/bedrock
nicolasmota/bedrock
ojorgensen/bedrock
onstash/bedrock
openjck/bedrock
pascalchevrel/bedrock
patilswapnilv/bedrock
petemoore/bedrock
petercpg/bedrock
plounze/bedrock
pmclanahan/bedrock
poglesbyg/bedrock
pombredanne/bedrock
pooozaa/bedrock
ppapadeas/bedrock
prakashkut/bedrock
purvi24/bedrock
quakpac/bedrock
quangquach/bedrock
reedloden/bedrock
retornam/bedrock
rik/bedrock
riverspirit/bedrock
rlr/bedrock
romil93/bedrock
rosanardila/bedrock
rossbruniges/bedrock
rtnpro/bedrock
rubenvereecken/bedrock
ryanfeeley/bedrock
saa14/bedrock
sashakruglov/bedrock
schalkneethling/bedrock
sgarrity/bedrock
shansm/bedrock
shawnl/bedrock
sinjiewang/bedrock
smillaedler/bedrock
sshepanski7/bedrock
stephendesroches/bedrock
sudheesh001/bedrock
sun19881209/bedrock
superduper/bedrock
sylvesterwillis/bedrock
sylvestre/bedrock
tbm/bedrock
theodorocaliari/bedrock
tikimaster/bedrock
tonychung/bedrock
trishasalas/bedrock
tsharman/bedrock
v1ka5/bedrock
vborrego/bedrock
viduthalai1947/bedrock
vinothrao/bedrock
xiaoxiao880919/bedrock
xxczaki/bedrock
xzryxz/bedrock-moz
yh453926638/bedrock
yingtaiGithub/bedrock
yjw2288/bedrock
Nothing to show
Commits on Feb 07, 2013
Commits on Feb 11, 2013
Commits on Feb 13, 2013
Commits on Feb 14, 2013
Merge pull request #624 from sgarrity/bug-824791-customize-link
Bug 824791 - Copy/Link change on /customize page
Merge pull request #633 from pmclanahan/bug-841393-dont-redirect-zh-T…
…W-firefox-partners

Bug 841393: Do not redirect /zh-TW/firefox/partners/
Merge pull request #632 from pmclanahan/bug-841006-donate-to-sendto
Bug 841006: Change all donate.m.o to sendto.m.o.
Commits on Feb 15, 2013
Bug 775542: Prevent templates from overriding with default langfiles.
The base templates had specified "main" in a "set_lang_files"
tag. This was causing child templates to look in "main.lang"
before the lang file for the template. This removes those
errant calls, as well as prevents such accidental additions
from breaking things in future.
Merge pull request #634 from pmclanahan/bug-775542-exclude-defaults-f…
…rom-langfiles

Bug 775542: Prevent templates from overriding with default langfiles.
Commits on Feb 19, 2013
Commits on Feb 20, 2013
Commits on Feb 21, 2013
Commits on Feb 22, 2013
Commits on Feb 23, 2013
Commits on Feb 24, 2013
Merge branch 'master' into merge-latest-playdoh
Conflicts:
	lib/l10n_utils/tests/test_dotlang.py
Showing with 91 additions and 24 deletions.
  1. +1 −1 bedrock/collusion/templates/collusion/collusion.html
  2. +1 −1 bedrock/firefox/templates/firefox/customize.html
  3. +2 −2 bedrock/firefox/templates/firefox/mobile/platforms.html
  4. +32 −0 bedrock/firefox/templates/firefox/technology.html
  5. +2 −2 bedrock/grants/templates/grants/base.html
  6. +1 −0 bedrock/mozorg/email_contribute.py
  7. +1 −1 bedrock/mozorg/templates/mozorg/base-resp.html
  8. +1 −1 bedrock/mozorg/templates/mozorg/base.html
  9. +1 −0 bedrock/mozorg/templates/mozorg/emails/infos.txt
  10. +1 −1 bedrock/mozorg/templates/mozorg/home.html
  11. +4 −0 bedrock/settings/__init__.py
  12. +7 −2 bedrock/settings/base.py
  13. +1 −1 bedrock/tabzilla/templates/tabzilla/tabzilla.js
  14. +3 −2 etc/httpd/global.conf
  15. +2 −1 lib/l10n_utils/dotlang.py
  16. +4 −2 lib/l10n_utils/gettext.py
  17. +2 −1 lib/l10n_utils/helpers.py
  18. +20 −1 lib/l10n_utils/tests/test_dotlang.py
  19. +1 −1 lib/l10n_utils/tests/test_files/templates/some_lang_files.html
  20. +1 −1 lib/l10n_utils/tests/test_gettext.py
  21. +2 −2 lib/l10n_utils/tests/test_template.py
  22. BIN media/img/firefox/technology/article-box-bg.png
  23. BIN media/img/firefox/technology/click-star.png
  24. BIN media/img/firefox/technology/tools-console.png
  25. BIN media/img/firefox/technology/tools-debugger.png
  26. BIN media/img/firefox/technology/tools-developer-toolbar.png
  27. BIN media/img/firefox/technology/tools-mobile.png
  28. BIN media/img/firefox/technology/tools-scratchpad.png
  29. BIN media/img/firefox/technology/tools-style-editor.png
  30. +1 −1 vendor
@@ -98,7 +98,7 @@ <h3>Collusion is about choice</h3>
</div>
<div class="span3 offset1">
- <form action="https://donate.mozilla.org/page/s/collusion" method="post" class="box" id="updates">
+ <form action="https://sendto.mozilla.org/page/s/collusion" method="post" class="box" id="updates">
<h3>Want to hear more?</h3>
<p class="intro">Get Mozilla updates:</p>
@@ -83,7 +83,7 @@ <h3>Add Style: <span>Personas</span></h3>
<div class="row">
<div class="span3">
<h3>Customize: <span>Add-ons</span></h3>
- <p>Many of the most popular add-ons are extensions, little extras you download to add more bells & whistles to Firefox. Compare prices, check the weather, listen to music, update your Facebook profile – all built right into the browser! There are <a href="https://addons.mozilla.org/firefox/">thousands to choose from</a>, but here are a few of our favorites:</p>
+ <p>Many of the most popular add-ons are extensions, little extras you download to add more bells & whistles to Firefox. Compare prices, check the weather, listen to music, update your Facebook profile – all built right into the browser! There are thousands to choose from, but <a href="https://addons.mozilla.org/en-US/firefox/extensions/?sort=featured">here are a few of our favorites</a>.</p>
</div>
<div id="addons-feature" class="span7">
<div id="addons-video" class="mozilla-video-control mozilla-video-shadow">
@@ -4,7 +4,7 @@
{% extends "/firefox/base-resp.html" %}
-{% block page_title %}Firefox on your mobile device{% endblock %}
+{% block page_title %}Supported Android Devices{% endblock %}
{% block body_id %}mobile-platforms{% endblock %}
{% block site_css %}
@@ -24,7 +24,7 @@
<div id="main-feature">
{{ mobile_download_button('download-mobile', 'mobile_small') }}
<hgroup>
- <h1 class="large">{{_('Firefox on your mobile device')}}</h1>
+ <h1 class="large">{{_('Supported Android Devices')}}</h1>
<h2>{{_('To find out if Firefox works on your phone, choose your manufacturer from the list below.')}}</h2>
</hgroup>
@@ -60,6 +60,38 @@ <h1>Developer <span>Tools</span></h1>
<p>Ever wonder what makes the Web work? Want to tinker with design and code? Firefox Developer Tools let you look under the hood of any Web page so you can debug, optimize and experiment with the Web.</p>
</div>
+<article>
+ <div class="demo">
+ <img src="{{ media('img/firefox/technology/tools-style-editor.png') }}" alt="Style Editor screenshot" />
+ </div>
+ <h1>Style Editor</h1>
+ <p>The Style Editor makes it easy to experiment with, revise and test changes to the appearance of Web pages. Edit the design of any page and see your changes instantly as you modify the stylesheet. Try it out from the Web Developer menu.</p>
+</article>
+
+<article>
+ <div class="demo">
+ <img src="{{ media('img/firefox/technology/tools-debugger.png') }}" alt="Debugger screenshot" />
+ </div>
+ <h1>Debugger</h1>
+ <p>Quickly hunt down problems in your JavaScript code as you pause, play and watch script execution by setting breakpoints in the source editor. All of the scripts are listed in a menu and you can jump to a file by typing part of its name. It also supports remote debugging for Firefox OS and Firefox for Android.</p>
+</article>
+
+<article>
+ <div class="demo">
+ <img src="{{ media('img/firefox/technology/tools-mobile.png') }}" alt="Mobile developer tools screenshot" />
+ </div>
+ <h1>Mobile developer tools</h1>
+ <p>Our Responsive Design View tool makes it easy to resize the page you’re viewing to see what it would look like on any screen, all from the comfort of your desktop. You can also troubleshoot JavaScript running on your mobile with the Debugger. Connect to Firefox for Android or Firefox OS and use your desktop monitor to debug your mobile device.</p>
+</article>
+
+<article>
+ <div class="demo">
+ <img src="{{ media('img/firefox/technology/tools-developer-toolbar.png') }}" alt="Developer Toolbar screenshot" />
+ </div>
+ <h1>Developer Toolbar</h1>
+ <p>Fast, easy and intuitive, the Developer Toolbar saves you time when working on Web development. It provides easy keyboard control over a variety of tools and automatically completes commands and parameters as you type. Find it in the Web Developer menu or hit shift+F2.</p>
+</article>
+
<article class="hasdemo">
<div class="demo">
<img src="{{ media('img/firefox/technology/tools-console.png') }}" alt="Web Console screenshot" />
@@ -22,12 +22,12 @@ <h3>Help us build a better Web</h3>
<p>We're a non-profit organization working to build a Web that is open, accessible, safe and — most of all — a force for good.</p>
<p>Mozilla builds communities and gives people tools to control their online experience. We are about enriching people's lives instead of benefiting shareholders. We believe a better Web means a happier future for all of us — and we depend on your collaboration and financial support to build it.</p>
- <p>So please consider making a donation today: <a href="https://donate.mozilla.org/page/contribute/join-mozilla">Join us here</a>.</p>
+ <p>So please consider making a donation today: <a href="https://sendto.mozilla.org/page/contribute/join-mozilla">Join us here</a>.</p>
{% endblock %}
</aside>
</div>
</div>
{% endblock %}
-{% block email_form %}&nbsp;{% endblock %}
+{% block email_form %}&nbsp;{% endblock %}
@@ -93,6 +93,7 @@
'es-ES': ['participa@mozilla-hispano.org'],
'nl' : ['contribute@mozilla-nl.org'],
'pt-BR': ['marcelo.araldi@yahoo.com.br'],
+ 'zh-TW': ['contribute@mail.moztw.org'],
}
@@ -8,7 +8,7 @@
{% block email_form %}
<form class="billboard" id="footer-email-form" method="post"
- action="https://donate.mozilla.org/page/s/sign-up-for-mozilla"
+ action="https://sendto.mozilla.org/page/s/sign-up-for-mozilla"
onSubmit="dcsMultiTrack('DCS.dcsuri', '/button/newsletter.html', 'WT.ti', 'Newsletter%20Button%20Click');">
<h3>Get Mozilla updates</h3>
@@ -6,7 +6,7 @@
{% block email_form %}
<form class="billboard" id="footer-email-form" method="post"
- action="https://donate.mozilla.org/page/s/sign-up-for-mozilla"
+ action="https://sendto.mozilla.org/page/s/sign-up-for-mozilla"
onSubmit="dcsMultiTrack('DCS.dcsuri', '/button/newsletter.html', 'WT.ti', 'Newsletter%20Button%20Click');">
<h3>Get Mozilla updates</h3>
@@ -1,3 +1,4 @@
Email: {{ email }}
Area of Interest: {{ interest }}
+Language: {{ request.locale }}
Comment: {{ comments }}
@@ -172,7 +172,7 @@ <h4>{{_('Work with us')}}</h4>
<h4>{{_('Find us')}}</h4>
<p>{{_('Contact one of our global Mozilla Spaces.')}}</p>
</a></li>
- <li id="about-join"><a href="https://donate.mozilla.org/page/contribute/join-mozilla">
+ <li id="about-join"><a href="https://sendto.mozilla.org/page/contribute/join-mozilla">
<h4>{{_('Join us')}}</h4>
<p>{{_('Show your support and help us build a better Web.')}}</p>
</a></li>
@@ -8,3 +8,7 @@
except ImportError, exc:
exc.args = tuple(['%s (did you rename settings/local.py-dist?)' % exc.args[0]])
raise exc
+
+
+if DEV:
+ ALLOWED_HOSTS = ['*']
View
@@ -49,12 +49,17 @@
'gameon',
]
+ALLOWED_HOSTS = [
+ 'www.mozilla.org',
+ 'www.allizom.org',
+]
+
# Make this unique, and don't share it with anybody.
-SECRET_KEY = '1iz#v0m55@h26^m6hxk3a7at*h$qj_2a$juu1#nv50548j(x1v'
+SECRET_KEY = 'ssssshhhhh'
TEMPLATE_DIRS = (
path('templates'),
- path('locale')
+ path('locale'),
)
@@ -565,7 +565,7 @@ Tabzilla.content =
+ ' <li><a href="https://www.mozilla.org/contribute/">{{ _('Volunteer')|js_escape }}</a></li>'
+ ' <li><a href="https://www.mozilla.org/en-US/about/careers.html">{{ _('Careers')|js_escape }}</a></li>'
+ ' <li><a href="https://www.mozilla.org/en-US/about/mozilla-spaces/">{{ _('Find us')|js_escape }}</a></li>'
- + ' <li><a href="https://donate.mozilla.org/">{{ _('Join us')|js_escape }}</a></li>'
+ + ' <li><a href="https://join.mozilla.org/">{{ _('Join us')|js_escape }}</a></li>'
+ ' </ul>'
+ ' </li>'
+ ' <li id="tabzilla-search">'
View
@@ -6,8 +6,9 @@ ExpiresActive on
## Redirect things externally!
-# bug 764261
+# bug 764261, 841393
RewriteRule ^/zh-TW/$ http://mozilla.com.tw/ [L,R=301]
+RewriteCond %{REQUEST_URI} !^/zh-TW/firefox/partners/?$
RewriteRule ^/zh-TW/firefox(/.*)?$ http://mozilla.com.tw/firefox$1 [L,R=301]
RewriteRule ^/zh-TW/mobile/?$ http://mozilla.com.tw/firefox/mobile/ [L,R=301]
RewriteRule ^/zh-TW/download/?$ http://mozilla.com.tw/firefox/download/ [L,R=301]
@@ -165,7 +166,7 @@ RewriteRule ^/telemetry/?$ /b/telemetry/ [PT]
RewriteRule ^/(\w{2,3}(?:-\w{2}(?:-mac)?)?/)?firefox/partners(.*)$ /b/$1firefox/partners$2 [PT]
# bug 831810
-RewriteRule ^/(\w{2,3}(?:-\w{2}(?:-mac)?)?/)?mwc/?$ /$1firefox/partners/ [L,R=301]
+RewriteRule ^/(\w{2,3}(?:-\w{2}(?:-mac)?)?/)?mwc/?$ /$1firefox/partners/ [NC,L,R=301]
# bug 833645
RewriteRule ^/en-US/firefox(/(?:\d+\.\d+\.?(?:\d+)?\.?(?:\d+)?(?:[a|b]?)(?:\d*)(?:pre)?(?:\d)?))?/firstrun(/?)$ /b/en-US/firefox$1/firstrun$2 [PT]
@@ -109,6 +109,7 @@ def translate(text, files):
def _get_extra_lang_files():
frame = inspect.currentframe()
+ new_lang_files = []
if frame is None:
if settings.DEBUG:
import warnings
@@ -125,7 +126,7 @@ def _get_extra_lang_files():
if new_lang_files:
if isinstance(new_lang_files, basestring):
new_lang_files = [new_lang_files]
- return new_lang_files
+ return [lf for lf in new_lang_files if lf not in settings.DOTLANG_FILES]
def _(text, *args, **kwargs):
@@ -116,7 +116,8 @@ def parse_python(path):
new_lang_files = eval(untokenize(result))
if isinstance(new_lang_files, basestring):
new_lang_files = [new_lang_files]
- return new_lang_files
+ # remove empties
+ return [lf for lf in new_lang_files if lf]
return []
@@ -147,7 +148,8 @@ def ignore_whitespace(tokens):
lang_files.append(arg[2].strip('"'))
arg = ignore_whitespace(tokens)
- lang_files = filter(lambda x: x, lang_files)
+ # remove empties
+ lang_files = [lf for lf in lang_files if lf]
if lang_files:
return lang_files
return []
@@ -46,7 +46,8 @@ def lang_files(ctx, *files):
"""Add more lang files to the translation object"""
# Filter out empty files
install_lang_files(ctx)
- add_lang_files(ctx, [f for f in files if f])
+ add_lang_files(ctx, [f for f in files
+ if f and f not in settings.DOTLANG_FILES])
# backward compatible for imports
@@ -197,6 +197,26 @@ def test_new_lang_files_do_not_modify_settings(self, trans_patch):
trans_patch.assert_called_with(trans_str, call_lang_files)
eq_(old_setting, settings.DOTLANG_FILES)
+ @patch('lib.l10n_utils.dotlang.translate')
+ def test_gettext_ignores_default_lang_files(self, trans_patch):
+ """
+ The `l10n_utils.dotlang._` function should search .lang files
+ specified in the module from which it's called before the
+ default files, but it should not include the defaults twice.
+ """
+ # use LANG_FILES global in this module
+ global LANG_FILES
+ old_lang_files = LANG_FILES
+
+ trans_str = 'Translate me'
+ LANG_FILES = [settings.DOTLANG_FILES[0], 'dude', 'donnie', 'walter']
+ _(trans_str)
+ call_lang_files = LANG_FILES[1:] + settings.DOTLANG_FILES
+ trans_patch.assert_called_with(trans_str, call_lang_files)
+
+ # restore original value to avoid test leakage
+ LANG_FILES = old_lang_files
+
@patch('lib.l10n_utils.dotlang.translate')
def test_gettext_searches_specified_lang_files(self, trans_patch):
"""
@@ -239,7 +259,6 @@ def test_gettext_searches_kwarg_specified_lang_files(self, trans_patch):
# test the case when LANG_FILES is a list
lang_files_list = ['maude', 'bunny', 'uli']
_(trans_str, lang_files=lang_files_list)
- print lang_files_list
call_lang_files = lang_files_list + settings.DOTLANG_FILES
trans_patch.assert_called_with(trans_str, call_lang_files)
@@ -5,6 +5,6 @@
{% extends "no_lang_files.html" %}
{% block content %}
- {% add_lang_files "dude" "walter" %}
+ {% add_lang_files "dude" "walter" "main" %}
{{ _('Content yo!') }}
{% endblock %}
@@ -163,7 +163,7 @@ def test_templ_lang_files_defined(self):
""" If lang files are set, they should be returned. """
lang_files = langfiles_for_path('lib/l10n_utils/tests/test_files/'
'templates/some_lang_files.html')
- eq_(lang_files, ['dude', 'walter'])
+ eq_(lang_files, ['dude', 'walter', 'main'])
def test_py_no_lang_files_defined(self):
"""
@@ -105,8 +105,8 @@ def test_added_lang_files_inheritance(self):
@patch('lib.l10n_utils.helpers.translate')
def test_lang_files_order(self, translate):
"""
- Lang files should be queried in order they appear in the file and then
- the defaults.
+ Lang files should be queried in order they appear in the file,
+ excluding defaults and then the defaults.
"""
self.client.get('/de/some-lang-files/')
translate.assert_called_with(ANY, ['dude', 'walter', 'some_lang_files',
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
2 vendor
Submodule vendor updated 35 files
+1 −1 lib/python/django/__init__.py
+4 −0 lib/python/django/conf/global_settings.py
+4 −0 lib/python/django/conf/project_template/project_name/settings.py
+2 −2 lib/python/django/contrib/admin/filters.py
+8 −2 lib/python/django/contrib/admin/options.py
+4 −1 lib/python/django/contrib/auth/hashers.py
+5 −0 lib/python/django/contrib/auth/tests/hashers.py
+5 −0 lib/python/django/contrib/auth/tests/views.py
+22 −29 lib/python/django/contrib/auth/views.py
+4 −7 lib/python/django/contrib/comments/views/comments.py
+3 −4 lib/python/django/contrib/comments/views/moderation.py
+6 −4 lib/python/django/contrib/comments/views/utils.py
+2 −0 lib/python/django/contrib/contenttypes/tests.py
+1 −23 lib/python/django/contrib/gis/db/backends/oracle/compiler.py
+10 −0 lib/python/django/contrib/gis/db/backends/oracle/operations.py
+20 −16 lib/python/django/contrib/gis/tests/inspectapp/tests.py
+2 −0 lib/python/django/contrib/sites/tests.py
+94 −1 lib/python/django/core/serializers/xml_serializer.py
+8 −2 lib/python/django/db/__init__.py
+17 −0 lib/python/django/db/backends/__init__.py
+1 −1 lib/python/django/db/backends/mysql/base.py
+1 −1 lib/python/django/db/backends/sqlite3/base.py
+38 −9 lib/python/django/db/models/fields/related.py
+2 −0 lib/python/django/db/models/sql/compiler.py
+15 −0 lib/python/django/db/transaction.py
+10 −2 lib/python/django/forms/formsets.py
+48 −5 lib/python/django/http/__init__.py
+20 −1 lib/python/django/middleware/transaction.py
+3 −0 lib/python/django/test/testcases.py
+6 −0 lib/python/django/test/utils.py
+1 −2 lib/python/django/utils/html_parser.py
+12 −0 lib/python/django/utils/http.py
+7 −5 lib/python/django/views/i18n.py
+1 −1 src/django-arecibo
+1 −1 src/funfactory

No commit comments for this range