Skip to content
This repository has been archived by the owner on May 28, 2019. It is now read-only.

Fix Bug 848839 #177

Merged
merged 1 commit into from
Mar 13, 2013
Merged

Fix Bug 848839 #177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions flicks/base/templates/bare.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,20 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>{{ _('Firefox Flicks') }} : {% block page_title %}{% endblock %}</title>

{# Meta Description - used for page description and og:description #}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

L10n comments must start with L10n::

{# L10n: Meta Description #}

{% set meta_description = meta_description or _('Firefox Flicks is a contest that invites Firefox fans and filmmakers
from all over the world to create short videos (or &#34;flicks&#34;) to help
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should probably remove these newlines now that the string isn't in a trans block.

tell the Firefox story.') %}
<meta name="description" content="{{ meta_description }}">
<meta name="robots" content="noodp">

{# OpenGraph Metadata #}
<meta property="og:title" content="{% block og_title %}{{ _('Firefox Flicks') }}{% endblock %}">
<meta property="og:type" content="{% block og_type %}website{% endblock %}">
<meta property="og:image" content="{% block og_image %}{{ absolutify(static('img/flicks-logo-180.png')) }}{% endblock %}">
<meta property="og:url" content="{% block og_url %}{{ request.build_absolute_uri() }}{% endblock %}">
<meta property="og:site_name" content="{{ _('Firefox Flicks') }}">
{% block meta_description -%}
<meta property="og:description" content="{% trans %}
Firefox Flicks is a contest that invites Firefox fans and filmmakers
from all over the world to create short videos (or &#34;flicks&#34;) to help
tell the Firefox story.
{% endtrans %}">
{%- endblock %}
<meta property="og:description" content="{{ meta_description }}">

<!--[if lt IE 9]>
<script src="{{ static('js/libs/html5.js') }}"></script>
Expand Down
11 changes: 2 additions & 9 deletions flicks/base/templates/faq.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,8 @@

{% block page_title %}{{ _('FAQ') }}{% endblock %}


{% block meta_description -%}
<meta property="og:description" content="{% trans %}

Firefox Flicks FAQ &#8212; Your questions answered. Our FAQ covers all the details on
how to enter the video contest and win prizes.

{% endtrans %}">
{%- endblock %}
{% set meta_description = _('Firefox Flicks FAQ &#8212; Your questions answered. Our FAQ covers all the details on
how to enter the video contest and win prizes.') %}

{% block content %}
<div class="section">
Expand Down
9 changes: 2 additions & 7 deletions flicks/base/templates/judges.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,8 @@

{% block page_title %}{{ _('Judges') }}{% endblock %}


{% block meta_description -%}
<meta property="og:description" content="{% trans %}
Get to know our illustrious panel of celebrity judges who
will see your flick and help us choose this year's winner.
{% endtrans %}">
{%- endblock %}
{% set meta_description = _('Get to know our illustrious panel of celebrity judges who
will see your flick and help us choose this year\'s winner.') %}

{% block content %}
<div class="section">
Expand Down
5 changes: 1 addition & 4 deletions flicks/base/templates/rules/de.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,7 @@

{% block page_title %}Firefox Flicks-Gewinnspiel – Offizielle Regeln{% endblock %}


{% block meta_description -%}
<meta property="og:description" content="Firefox Flicks-Gewinnspiel – Offizielle Regeln">
{%- endblock %}
{% set meta_description = 'Firefox Flicks-Gewinnspiel – Offizielle Regeln' %}

{% block content %}
<div class="section">
Expand Down
9 changes: 1 addition & 8 deletions flicks/base/templates/rules/en-US.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,7 @@

{% block page_title %}Firefox Flicks Contest Official Rules{% endblock %}


{% block meta_description -%}
<meta property="og:description" content="{% trans %}

Firefox Flicks Contest Official Rules

{% endtrans %}">
{%- endblock %}
{% set meta_description = _('Firefox Flicks Contest Official Rules') %}

{% block content %}
<div class="section">
Expand Down
5 changes: 1 addition & 4 deletions flicks/base/templates/rules/es.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,7 @@

{% block page_title %}Normas oficiales del concurso de Firefox Flicks{% endblock %}


{% block meta_description -%}
<meta property="og:description" content="Normas oficiales del concurso de Firefox Flicks">
{%- endblock %}
{% set meta_description = 'Normas oficiales del concurso de Firefox Flicks' %}

{% block content %}
<div class="section">
Expand Down
5 changes: 1 addition & 4 deletions flicks/base/templates/rules/fr.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,7 @@

{% block page_title %}Règlement officiel du concours Firefox Flicks{% endblock %}


{% block meta_description -%}
<meta property="og:description" content="Règlement officiel du concours Firefox Flicks">
{%- endblock %}
{% set meta_description = 'Règlement officiel du concours Firefox Flicks' %}

{% block content %}
<div class="section">
Expand Down
5 changes: 1 addition & 4 deletions flicks/base/templates/rules/pl.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,7 @@

{% block page_title %}Oficjalny Regulamin konkursu Firefox Flicks{% endblock %}


{% block meta_description -%}
<meta property="og:description" content="Oficjalny Regulamin konkursu Firefox Flicks">
{%- endblock %}
{% set meta_description = 'Oficjalny Regulamin konkursu Firefox Flicks' %}

{% block content %}
<div class="section">
Expand Down
5 changes: 1 addition & 4 deletions flicks/base/templates/rules/pt-BR.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,7 @@

{% block page_title %}Regras Oficiais do Concurso Firefox Flicks{% endblock %}


{% block meta_description -%}
<meta property="og:description" content="Regras Oficiais do Concurso Firefox Flicks">
{%- endblock %}
{% set meta_description = 'Regras Oficiais do Concurso Firefox Flicks' %}

{% block content %}
<div class="section">
Expand Down
5 changes: 2 additions & 3 deletions flicks/videos/templates/videos/2012/promo.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@
{% block page_title %}{{ video_title }}{% endblock %}

{% block og_title %}{{ video_title }}{% endblock %}
{% block meta_description -%}
<meta property="og:description" content="{{ video_description }}">
{%- endblock %}

{% set meta_description = video_description %}

{% block video_embed %}
{{ video_embed }}
Expand Down
12 changes: 5 additions & 7 deletions flicks/videos/templates/videos/2013/details.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,11 @@

{% block og_title %}{{ video.title }}{% endblock %}
{% block og_image %}{{ absolutify(video.thumbnail_url) }}{% endblock %}
{% block meta_description %}
{% if video.description %}
<meta property="og:description" content="{{ video.description }}">
{% else %}
<meta property="og:description" content="{{ _('An entry for Firefox Flicks 2013, a global video contest about the power of mobile.') }}">
{% endif %}
{% endblock %}>
{% if video.description %}
{% set meta_description = video.description %}
{% else %}
{% set meta_description = _('An entry for Firefox Flicks 2013, a global video contest about the power of mobile.') %}
{% endif %}

{% block video_embed %}
{{ video.embed_html(width='100%') }}
Expand Down