Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #52 from ednapiranha/bug730155

updated copy and regions; fix bug 730155
  • Loading branch information...
commit 486d581acea5044649cc11016bbe718cd8b4a812 2 parents 6af436e + c0c5208
@ednapiranha ednapiranha authored
View
4 flicks/base/templates/creative.html
@@ -161,8 +161,8 @@
</li>
<li>
{% trans %}
- Flicks must be submitted no later than midnight Pacific Standard Time on
- April 12, 2012.
+ Flicks must be submitted no later than midnight Pacific Standard Time
+ on May 1, 2012.
{% endtrans %}
</li>
<li>
View
31 flicks/base/templates/faq.html
@@ -52,10 +52,10 @@
<h2>{{ _('Is the contest open to international entries?') }}</h2>
<p>
{% trans %}
- Yes. This contest is open to anyone in world. We will, however, choose one
- winner for North America, one winner for Latin America, one winner for Asia,
- Australia &amp; New Zealand and one winner for Europe &amp; Africa (or whichever
- of those is closest to where youre from).
+ Yes. This contest is open to anyone in world. We will, however, choose one winner
+ for North America, one winner for Latin America, one winner for Africa, Australia
+ &amp; New Zealand and one winner for Europe (or whichever of those is closest to
+ where you're from).
{% endtrans %}
</p>
@@ -109,19 +109,19 @@
<p>
{% trans %}
But there's more! The grand prize winner in each region (North America, Latin America, EU and
- Asia, Australia &amp; New Zealand) will receive their choice of either $5,000 in video equipment or
- a film school scholarship. The top two winners in each category get $1,000 in video equipment. Top
- category winners for each region and the grand prize winner will also get a trip to a Firefox
- Flicks event in 2012. Any video that makes it into the contest will get a Firefox prize pack. On
- top of all that, if you win, your flick could be used to share the amazing story of Firefox with
- the world.
+ Asia, Australia &amp; New Zealand) will receive their choice of either $10,000 (USD) in video
+ equipment or cash to spend on film school expenses or your next project. There will be four
+ category winners in each of the four regions, the winners will get $5,000 (USD) in video
+ equipment or cash to spend on film school expenses or your next project. There will also be
+ runner ups in each of the four categories in each region, these winners will receive $1000
+ (USD) in video equipment or cash to spend on film school expenses or your next project.
{% endtrans %}
</p>
- <h2>{{ _('Is there a maximum video length and file size?') }}</h2>
+ <h2>{{ _('Is there a maximum video length?') }}</h2>
<p>
{% trans %}
- The maximum video length is 120 seconds and the maximum file size is **KB.
+ The maximum video length is 120 seconds.
{% endtrans %}
</p>
@@ -189,9 +189,10 @@
<h2>{{ _('Can I submit a flick in a language other than English?') }}</h2>
<p>
- {% trans %}
+ {% trans flicks_email='mailto:firefoxflicks@mozilla.org' %}
Yes. For non-English entries, you will need to submit a full and accurate script or subtitles. If
- you're having trouble getting your flick translated, please contact us. We can help.
+ you're having trouble getting your flick translated, please
+ <a href="{{ flicks_email }}">contact us</a>. We can help.
{% endtrans %}
</p>
@@ -214,7 +215,7 @@
<h2>{{ _('Will entries be available to the general public?') }}</h2>
<p>
{% trans %}
- Your flick will be posted on the voting site so that people can help choose the grand prize winner.
+ Your flick will be posted on the voting site so that people can watch and upvote their favorite flicks.
{% endtrans %}
</p>
View
6 flicks/base/templates/prizes.html
@@ -27,9 +27,13 @@
<h2>{{ _('CATEGORY PRIZES &#8212; $5000 (USD)') }}</h2>
<p>
{% trans %}
- The category prize winners (2 from each category in each region) will each receive $5000 (USD)
+ The category winner (first place in each category in each region) will each receive $5000 (USD)
in video equipment or cash to be used towards school expenses (if the winner is currently
enrolled in an accredited film school or film program at an accredited college or university).
+ The category runner up winner (second place in each category in each region) will each receive
+ $1000 (USD) in video equipment or cash to be used towards school expenses (if the winner is
+ currently enrolled in an accredited film school or film program at an accredited college or
+ university).
{% endtrans %}
</p>
View
17 flicks/videos/forms.py
@@ -1,8 +1,9 @@
from django import forms
+import jinja2
from elasticutils import S
from happyforms import Form, ModelForm
-from tower import ugettext_lazy as _lazy
+from tower import ugettext as _, ugettext_lazy as _lazy
from flicks.videos.models import CATEGORY_CHOICES, REGION_CHOICES, Video
@@ -17,11 +18,15 @@ class Meta:
model = Video
fields = ('title', 'upload_url', 'category', 'region', 'description')
- agreement = forms.BooleanField(label=_lazy(u'I agree to the Contest Rules,'
- 'Vid.ly terms of service and '
- 'give Mozilla permission to '
- 'use my video.'),
- required=True)
+ agreement = forms.BooleanField(required=True)
+
+ def __init__(self, *args, **kwargs):
+ super(UploadForm, self).__init__(*args, **kwargs)
+
+ self.fields['agreement'].label = jinja2.Markup(_(
+ u'I agree to the Contest Rules, <a href="{url}" target="_blank">Vid.ly '
+ 'terms of service</a> and give Mozilla permission to use my '
+ 'video.')).format(url='http://www.encoding.com/sla')
class SearchForm(Form):
View
6 flicks/videos/models.py
@@ -32,10 +32,10 @@
)
REGION_CHOICES = (
- ('americas', _lazy('The Americas')),
+ ('america', _lazy('North America')),
+ ('latin_america', _lazy('Latin America')),
('europe', _lazy('Europe')),
- ('asia', _lazy('Asia, Oceania & Australia')),
- ('africa', _lazy('Africa'))
+ ('asia_africa_australia', _lazy('Asia, Africa & Australia'))
)
View
6 flicks/videos/tests/test_forms.py
@@ -36,9 +36,9 @@ def test_category_filter(self):
def test_region_filter(self):
"""Test that search results can be filtered by region."""
- with nested(build_video(self.user, region='asia'),
- build_video(self.user, region='africa')) as (v1, v2):
- eq_(list(self._videos(region='africa')), [v2])
+ with nested(build_video(self.user, region='america'),
+ build_video(self.user, region='europe')) as (v1, v2):
+ eq_(list(self._videos(region='europe')), [v2])
def test_invalid_search(self):
"""Test that an invalid form will return an empty list."""
View
2  flicks/videos/tests/test_views.py
@@ -21,7 +21,7 @@ class UploadTests(TestCase):
def _post(self, **kwargs):
"""Execute upload view with kwargs as POST arguments."""
args = {'title': 'Test', 'upload_url': 'http://test.com',
- 'category': 'thirty_spot', 'region': 'americas',
+ 'category': 'thirty_spot', 'region': 'america',
'agreement': 'on'}
args.update(kwargs)
with self.activate('en-US'):
View
5 media/css/main.css
@@ -10,10 +10,15 @@ div.field label {
div.field.agreement label {
float: left;
+ font-size: 15px;
text-align: left;
width: 500px;
}
+div.field.agreement label a {
+ color: #fff;
+}
+
.content-wrapper .agreement {
padding-bottom: 20px;
}
Please sign in to comment.
Something went wrong with that request. Please try again.