From b0df1ed4884a16c5c45800031667e0dd3251c978 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Tue, 18 Apr 2017 15:11:32 +0100
Subject: [PATCH] Make the locale file page specific
---
app/views/layouts/_head.html.haml | 1 -
app/views/projects/cycle_analytics/show.html.haml | 4 +++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/app/views/layouts/_head.html.haml b/app/views/layouts/_head.html.haml
index 7e198679489..19473b6ab27 100644
--- a/app/views/layouts/_head.html.haml
+++ b/app/views/layouts/_head.html.haml
@@ -31,7 +31,6 @@
= webpack_bundle_tag "runtime"
= webpack_bundle_tag "common"
= webpack_bundle_tag "main"
- = webpack_bundle_tag "locale"
- if content_for?(:page_specific_javascripts)
= yield :page_specific_javascripts
diff --git a/app/views/projects/cycle_analytics/show.html.haml b/app/views/projects/cycle_analytics/show.html.haml
index 47fde758ffc..a0a629eaa41 100644
--- a/app/views/projects/cycle_analytics/show.html.haml
+++ b/app/views/projects/cycle_analytics/show.html.haml
@@ -2,6 +2,7 @@
- page_title "Cycle Analytics"
- content_for :page_specific_javascripts do
= page_specific_javascript_bundle_tag('common_vue')
+ = page_specific_javascript_bundle_tag('locale')
= page_specific_javascript_bundle_tag('cycle_analytics')
= render "projects/head"
@@ -19,7 +20,8 @@
%p
{{ 'Cycle Analytics gives an overview of how much time it takes to go from idea to production in your project.' | translate }}
- = link_to "Read more", help_page_path('user/project/cycle_analytics'), target: '_blank', class: 'btn'
+ = link_to help_page_path('user/project/cycle_analytics'), target: '_blank', class: 'btn' do
+ {{ 'Read more' | translate }}
= icon("spinner spin", "v-show" => "isLoading")
.wrapper{ "v-show" => "!isLoading && !hasError" }
.panel.panel-default
--
GitLab