Merge pull request #1724 from jpetto/bug-968314-mwc-news-headlines-on…

…-home-page

Add FxOS headlines to home page. Bug 968314.

bedrock/firefox/views.py

@@ -32,7 +32,7 @@
 
 LANG_FILES = ['firefox/partners/index']
 
-LOCALE_HEADLINES = {
+LOCALE_FXOS_HEADLINES = {
     'de': {
         'title': u"Firefox OS ist richtungsweisend für die Zukunft des "
             "mobilen Marktes",
@@ -46,7 +46,7 @@
     },
     'en-US': {
         'title': _('Firefox OS Unleashes the Future of Mobile'),
-        'url': 'http://blog.mozilla.org/press/2014/02/firefox-os-future-2/',
+        'url': 'https://blog.mozilla.org/press/2014/02/firefox-os-future-2/',
     },
     'es-AR': {
         'title': u'Firefox OS te desvela el futuro de lo móvil',
@@ -219,11 +219,11 @@ def all_downloads(request, channel):
 @csrf_protect
 def firefox_partners(request):
     # If the current locale isn't in our list, return the en-US value
-    press_locale = request.locale if (request.locale in LOCALE_HEADLINES) else 'en-US'
+    press_locale = request.locale if (request.locale in LOCALE_FXOS_HEADLINES) else 'en-US'
 
     template_vars = {
-        'locale_headline_url': LOCALE_HEADLINES[press_locale]['url'],
-        'locale_headline_title': LOCALE_HEADLINES[press_locale]['title'],
+        'locale_headline_url': LOCALE_FXOS_HEADLINES[press_locale]['url'],
+        'locale_headline_title': LOCALE_FXOS_HEADLINES[press_locale]['title'],
         'js_common': JS_COMMON,
         'js_mobile': JS_MOBILE,
         'js_desktop': JS_DESKTOP,

bedrock/mozorg/templates/mozorg/home.html

@@ -210,25 +210,25 @@ <h4><strong>{{_('Different by&nbsp;design')}}</strong></h4>
         <h2>{{ _('In the news') }}</h2>
         <ul class="hfeed cycle-slideshow" data-cycle-timeout="6000" data-cycle-slides="> .hentry" data-cycle-fx="carousel" data-cycle-carousel-fluid="true" data-cycle-carousel-vertical="true" data-cycle-next=".news-buttons .btn-next" data-cycle-prev=".news-buttons .btn-prev" data-cycle-carousel-visible="1" data-cycle-pause-on-hover="true">
 
-        {% l10n home_news, 20131010 %}
+        {% l10n home_news, 20140223 %}
           <li class="hentry">
             <h3 class="entry-title">
-              <a class="url go" rel="bookmark external" hreflang="en-US" href="{{ url('foundation.annualreport.2012.index') }}">
-                State of Mozilla and 2012 Financial Statements
+              <a class="url go" rel="bookmark external" hreflang="en-US" href="https://blog.mozilla.org/press/2014/02/firefox-os-future-2/">
+                Firefox OS Unleashes the Future of Mobile
               </a>
             </h3>
           </li>
           <li class="hentry">
             <h3 class="entry-title">
-              <a class="url go" rel="bookmark external" hreflang="en-US" href="https://blog.mozilla.org/press/2013/11/firefox-marketplace-shows-the-power-of-the-web-delivers-cross-platform-global-and-local-apps/">
-                Firefox Marketplace Shows the Power of the Web, Delivers Cross-Platform Global and Local Apps
+              <a class="url go" rel="bookmark external" hreflang="en-US" href="https://blog.mozilla.org/press/2014/02/firefox-os-news-2/">
+                Firefox OS Expands to Higher-Performance Devices and Pushes the Boundaries of Entry-Level Smartphones
               </a>
             </h3>
           </li>
           <li class="hentry">
             <h3 class="entry-title">
-              <a class="url go" rel="bookmark external" hreflang="en-US" href="https://blog.mozilla.org/blog/2013/10/09/mozilla-and-partners-to-kick-off-second-round-of-firefox-os-launches/">
-                Mozilla and Partners to Kick off Second Round of Firefox OS Launches in More Markets Around the World
+              <a class="url go" rel="bookmark external" hreflang="en-US" href="https://blog.mozilla.org/press/2014/02/developer-momentum-2/">
+                New Developer Hardware and Tools Show Firefox OS Ecosystem Momentum
               </a>
             </h3>
           </li>