Commit 941118d7 authored by Steffen van Bergerem's avatar Steffen van Bergerem Committed by Benjamin Neff
Browse files

Move formatting from locale to views 

closes #7283
parent fa0bd14d

app/helpers/report_helper.rb

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ module ReportHelper 
        post_path(item.post.id, anchor: item.guid)

      ))

    else

      raw t("report.not_found")

      t("report.not_found")

    end

  end

app/views/admins/stats.html.haml

+7 −3
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
          = submit_tag t('.go'), class: 'btn btn-primary'



      %h3

        != t('.display_results', :segment => @segment)

        != t("admins.stats.display_results", segment: content_tag(:strong, @segment))



      .row

        - [:posts, :comments, :aspect_memberships, :users].each do |name|
@@ -45,7 +45,9 @@ 
      .row

        .col-md-12

          %p.alert.alert-info.text-center{role: "alert"}

            != t('.current_segment', :post_yest => @posts[:yesterday]/@user_count.to_f, :post_day => @posts[:day_before]/@user_count.to_f)

            != t("admins.stats.current_segment",

              post_yest: content_tag(:strong, @posts[:yesterday] / @user_count.to_f),

              post_day: content_tag(:strong, @posts[:day_before] / @user_count.to_f))



      .row

        .col-md-12
@@ -53,4 +55,6 @@ 
          %ul

          - @popular_tags.each do |name,count|

            %li

              != t('.tag_name', :name_tag => name, :count_tag => count)
 
              != t("admins.stats.tag_name",

                name_tag: content_tag(:strong, name),

                count_tag: content_tag(:strong, count))

config/locales/diaspora/en.yml

+4 −4
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ en: 
      daily: "Daily"

      usage_statistic: "Usage statistics"

      go: "Go"

      display_results: "Displaying results from the <b>%{segment}</b> segment"

      display_results: "Displaying results from the %{segment} segment"

      posts:

        zero: "%{count} posts"

        one: "%{count} post"
@@ -155,9 +155,9 @@ en: 
        zero: "%{count} users"

        one: "%{count} user"

        other: "%{count} users"

      current_segment: "The current segment is averaging <b>%{post_yest}</b> posts per user, from <b>%{post_day}</b>"

      current_segment: "The current segment is averaging %{post_yest} posts per user, from %{post_day}"

      50_most: "50 most popular tags"

      tag_name: "Tag name: <b>%{name_tag}</b> Count: <b>%{count_tag}</b>"

      tag_name: "Tag name: %{name_tag} Count: %{count_tag}"

    pods:

      pod_network: "Pod network"

  aspects:
@@ -943,7 +943,7 @@ en: 
    delete_link: "Delete item"

    reported_user_details: "Details on reported user"

    confirm_deletion: "Are you sure to delete the item?"

    not_found: "<u>The post/comment was not found. It seems that it was deleted by the user!</u>"

    not_found: "The post/comment was not found. It seems that it was deleted by the user!"

    status:

      destroyed: "The post was destroyed"

      failed: "Something went wrong"

spec/controllers/admins_controller_spec.rb

+9 −3
Original line number Diff line number Diff line
@@ -140,7 +140,9 @@ describe AdminsController, :type => :controller do 
      expect(response).to be_success

      expect(response).to render_template(:stats)

      expect(response.body).to include(

        I18n.translate("admins.stats.display_results", segment: I18n.translate("admins.stats.daily"))

        I18n.translate(

          "admins.stats.display_results", segment: "<strong>#{I18n.translate('admins.stats.daily')}</strong>"

        )

      )

    end
@@ -150,10 +152,14 @@ describe AdminsController, :type => :controller do 
        expect(response).to be_success

        expect(response).to render_template(:stats)

        expect(response.body).not_to include(

          I18n.translate("admins.stats.display_results", segment: I18n.translate("admins.stats.daily"))

          I18n.translate(

            "admins.stats.display_results", segment: "<strong>#{I18n.translate('admins.stats.daily')}</strong>"

          )

        )

        expect(response.body).to include(

          I18n.translate("admins.stats.display_results", segment: I18n.translate("admins.stats.#{range}"))

          I18n.translate(

            "admins.stats.display_results", segment: "<strong>#{I18n.translate("admins.stats.#{range}")}</strong>"

          )

        )

      end

    end