Skip to content

Commit

Permalink
Fix spec and extract some string in translation
Browse files Browse the repository at this point in the history
  • Loading branch information
shingara committed Sep 16, 2013
1 parent 09f663f commit b6f670c
Show file tree
Hide file tree
Showing 2 changed files with 57 additions and 29 deletions.
58 changes: 29 additions & 29 deletions app/views/apps/show.html.haml
@@ -1,72 +1,72 @@
- content_for :title, app.name
- content_for :head do
= auto_discovery_link_tag :atom, app_path(app, User.token_authentication_key => current_user.authentication_token, :format => "atom"), :title => "Errbit notices for #{app.name} at #{request.host}"
= auto_discovery_link_tag :atom, app_path(app, User.token_authentication_key => current_user.authentication_token, :format => "atom"), :title => t('.atom_title', :name => app.name, :host => request.host)
- content_for :meta do
%strong Errors Caught:
%strong=t('.errors_caught')
= app.problems.count
%strong Deploy Count:
%strong=t('.deploy_count')
= app.deploys.count
%strong API Key:
%strong=t('.api_key')
= app.api_key
- content_for :action_bar do
- if current_user.admin?
= link_to 'edit', edit_app_path(app), :class => 'button'
= link_to t('.edit'), edit_app_path(app), :class => 'button'
- if all_errs
= link_to 'unresolved errs', app_path(app), :class => 'button'
= link_to t('.unresolved_errs'), app_path(app), :class => 'button'
- else
= link_to 'all errs', app_path(app, :all_errs => true), :class => 'button'
= link_to 'unwatch', app_watcher_path({:app_id => @app, :id => current_user.id}), :method => :delete, :class => 'button', :confirm => 'Are you sure?'
= link_to t('.all_errs'), app_path(app, :all_errs => true), :class => 'button'
= link_to t('.unwatch'), app_watcher_path({:app_id => app, :id => current_user.id}), :method => :delete, :class => 'button', :confirm => 'Are you sure?'

%h3#watchers_toggle
Watchers
%span.click_span (show/hide)
=t('.watchers')
%span.click_span=t('.show_hide')
#watchers_div
- if app.notify_all_users
%table.watchers
%thead
%tr
%th All users will be notified when something happens.
%th=t('.all_users_notified')
- else
%table.watchers
%thead
%tr
%th User or Email
%th=t('.user_or_email')
%tbody
- app.watchers.each do |watcher|
%tr
%td= watcher.label
- if app.watchers.none?
%tr
%td
%em Sadly, no one is watching this app
%em= t('.no_watcher')

- if app.github_repo?
%h3#repository_toggle
Repository
%span.click_span (show/hide)
=t('.repository')
%span.click_span=t('.show_hide')
#repository_div
%table.repository
%thead
%tr
%th GitHub Repo
%th=t('.github_repo')
%tbody
%tr
%td= link_to(app.github_repo, app.github_url, :target => '_blank')

%h3#deploys_toggle
Latest Deploys
%span.click_span (show/hide)
=t('.latest_deploys')
%span.click_span=t('.show_hide')
#deploys_div
- if deploys.any?
%table.deploys
%thead
%tr
%th When
%th Environment
%th Who
%th Message
%th Repository
%th Revision
%th=t('.when')
%th=t('.environment')
%th=t('.who')
%th=t('.message')
%th=t('.repository')
%th=t('.revision')

%tbody
- deploys.each do |deploy|
Expand All @@ -77,20 +77,20 @@
%td.message #{deploy.message}
%td.repository #{deploy.repository}
%td.revision #{deploy.short_revision}
= link_to "All Deploys (#{app.deploys.count})", app_deploys_path(app), :class => 'button'
= link_to t('.all_deploys', :count => app.deploys.count), app_deploys_path(app), :class => 'button'
- else
%h3 No deploys
%h3=t('.no_deploys')

- if app.problems.any?
%h3.clear Errors
%h3.clear=t('.errors')
%section
= form_tag search_problems_path(:all_errs => all_errs, :app_id => app.id), :method => :get, :remote => true do
= text_field_tag :search, params[:search], :placeholder => 'Search for issues'
= text_field_tag :search, params[:search], :placeholder => t('.search_placeholder')
%br
%section
.problem_table{:id => 'problem_table'}
= render 'problems/table', :problems => problems
- else
%h3.clear No errs have been caught yet, make sure you setup your app
%h3.clear=t('.no_error_yet')
= render 'configuration_instructions', :app => app

28 changes: 28 additions & 0 deletions config/locales/en.yml
Expand Up @@ -78,3 +78,31 @@ en:
new_app: Add a New App
no_apps: 'No apps here.'
click_to_create: 'Click here to create your first one'
show:
all_deploys: "All Deploys (%{count})"
all_errs: all errs
all_users_notified: "All users will be notified when something happens."
api_key: "API Key:"
atom_title: "Errbit notices for %{name} at %{host}"
deploy_count: "Deploy Count:"
edit: edit
environment: Environment
errors: Errors
errors_caught: "Errors Caught:"
github_repo: GitHub Repo
latest_deploys: Latest Deploys
message: Message
no_deploys: No deploys
no_error_yet: "No errs have been caught yet, make sure you setup your app"
no_watcher: "Sadly, no one is watching this app"
repository: Repository
repository: Repository
revision: Revision
search_placeholder: 'Search for issues'
show_hide: "(show/hide)"
unresolved_errs: unresolved errs
unwatch: unwatch
user_or_email: User or Email
watchers: Watchers
when: When
who: Who

0 comments on commit b6f670c

Please sign in to comment.