Merge pull request #280 from duyth1993/task-fix-bug-i18n

Fix convention and i18n

.gitignore

@@ -20,7 +20,7 @@ pickle-email-*.html
 /config/database.yml
 /public/uploads
 config/settings.local.yml
-config/settings/social_keys.yml
+config/social_keys.yml
 config/settings/*.local.yml
 config/environments/*.local.yml
 .DS_Store

Gemfile.lock

@@ -523,6 +523,3 @@ DEPENDENCIES
   unicorn
   web-console (~> 2.0)
   websocket-rails
-
-BUNDLED WITH
-   1.10.6

app/views/admin/dashboard/home.html.erb

@@ -1,3 +1,3 @@
-<% provide :title, t('admin.dashboards.home.title') %>
+<% provide :title, t("admin.dashboards.home.title") %>
 
-<div id='calendar'></div>
+<div id="calendar"></div>

app/views/admin/schedules/_schedule.html.erb

@@ -6,10 +6,10 @@
     <div class="col-md-12"><%= schedule.start_time.to_date.to_s %></div>
   </td>
   <td>
-    <div class="col-md-12"><%= schedule.start_time.strftime('%H:%M') %></div>
+    <div class="col-md-12"><%= schedule.start_time.strftime("%H:%M") %></div>
   </td>
   <td>
-    <div class="col-md-12"><%= schedule.finish_time.strftime('%H:%M') %></div>
+    <div class="col-md-12"><%= schedule.finish_time.strftime("%H:%M") %></div>
   </td>
   <td>
     <div class="col-md-12"><%= schedule.user.name %></div>
@@ -19,13 +19,15 @@
   </td>
   <td>
     <div id="schedule_state_<%= schedule.id %>">
-      <% if schedule.state == 'accepted' %>
+      <% if schedule.state == "accepted" %>
         <div class="accepted-event">accepted<div>
-      <% elsif schedule.state == 'rejected' %>
+      <% elsif schedule.state == "rejected" %>
         <div class="rejected-event">rejected<div>
       <% else %>
-        <%= link_to "Accept", admin_schedule_path(id: schedule.id, state: 'accepted'), method: :put, remote: true %>
-        <%= link_to "Reject", admin_schedule_path(id: schedule.id, state: 'rejected'), method: :put, remote: true %>
+        <%= link_to t("schedules.accept"), admin_schedule_path(id: schedule.id, state: "accepted"),
+          method: :put, remote: true %>
+        <%= link_to t("schedules.reject"), admin_schedule_path(id: schedule.id, state: "rejected"),
+          method: :put, remote: true %>
       <% end %>
     </div>
   </td>

app/views/admin/schedules/index.html.erb

@@ -1,17 +1,17 @@
-<% provide :title, "List event" %>
+<% provide :title, t("schedules.list_event") %>
 
-<h1>Manager Events</h1>
+<h1><%= t "schedules.manage_events" %></h1>
 
 <table class="table table-bordered table-striped">
   <thead>
     <tr class="table-col">
-      <th> Event </th>
-      <th width="100px"> Day </th>
-      <th width="80px"> Start </th>
-      <th width="80px"> Finish </th>
-      <th> User </th>
-      <th width="120px"> Room </th>
-      <th width="80px"> State </th>
+      <th> <%= t "schedules.index.event" %> </th>
+      <th width="100px"> <%= t "schedules.index.listing.day" %> </th>
+      <th width="80px"> <%= t "schedules.index.listing.start" %> </th>
+      <th width="80px"> <%= t "schedules.index.listing.finish" %> </th>
+      <th> <%= t "schedules.index.listing.user" %> </th>
+      <th width="120px"> <%= t "schedules.index.listing.room" %> </th>
+      <th width="80px"> <%= t "schedules.index.listing.state" %> </th>
     </tr>
   </thead>
   <tbody class="schedule-index">

app/views/pages/_event_preview_popup.html.erb

@@ -8,7 +8,7 @@
               <th class="cb-key"><%= t "quick_event.title" %>:</th>
               <td class="cb-value">
                 <span class="event-title"></span>
-                <a href="" class= "link-google"><%= t "quick_event.link_google" %></a>
+                <a href="javascript:void(0);" class= "link-google"><%= t "quick_event.link_google" %></a>
               </td>
             </tr>
             <tr>

app/views/shared/_error_messages.html.erb

@@ -1,7 +1,7 @@
 <% if object.errors.any? %>
   <div id="error_explanation">
     <div class="alert alert-danger">
-      The form contains <%= pluralize(object.errors.count, "error") %>.
+      <%= t "flash.error_msg", num_errors: pluralize(object.errors.count, Settings.error) %>
     </div>
     <ul>
       <% object.errors.full_messages.each do |msg| %>

app/views/shared/_header.html.erb

@@ -1,6 +1,6 @@
 <header class="navbar navbar-fixed-top">
   <div class="child-header" data-no-turbolink="true">
-    <%= link_to "Room Book System", root_path, id: "logo" %>
+    <%= link_to t("header.room_book_system"), root_path, id: "logo" %>
     <% if user_signed_in? %>
       <div class="search-box"><%= render "shared/search_box" %></div>
     <% end %>
@@ -9,7 +9,7 @@
       <ul class="nav navbar-nav navbar-right">
       <% if user_signed_in? %>
         <li class="dropdown">
-          <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+          <a href="javascript:void(0)" class="dropdown-toggle" data-toggle="dropdown">
             <div class="profile-image">
               <%= current_user.name %>&nbsp
               <%= image_tag current_user.avatar.url, width: "35", heigth: "35", class: "img-circle" %>

config/locales/en.yml

@@ -71,8 +71,10 @@ en:
     update: Event was updated!
     warning: "Invalid search"
     not_synch: "Failed to synch from google calendar"
+    error_msg: "The form contains %{num_errors}"
   header:
     loading: Loading...
+    room_book_system: Room Book System
 
   invalid:
     avatar: "should be less than %{max_avatar_file_size}MB"
@@ -116,6 +118,10 @@ en:
     announce_upcoming_event: Upcoming Event Announcement
     announce_updated_event: Updated Event Announcement
     edit_event_title: Edit event
+    list_event: List event
+    manage_events: Manage Events
+    accept: Accept
+    reject: Reject
     form:
       announced_before: Announce members before
       compose_description: Compose description...
@@ -144,6 +150,9 @@ en:
         start: Start
         state: State
         title: Title
+        event: Event
+        day: Day
+        user: User
     new:
       title: New event!
     repeat_schedule_notice_mail: "You are member for events"

config/locales/vi.yml

@@ -31,6 +31,10 @@ vi:
       sign_up_now: Dang nhap ngay!
 
   schedules:
+    list_event: Danh sach event
+    manage_events: Quan tri Events
+    accept: Chap nhan
+    reject: Tu choi
     form:
       event_name: Ten event
       event_title: Tieu de cua event
@@ -55,6 +59,9 @@ vi:
         finish: Ket thuc
         state: Trang thai
         action: Hanh dong
+        event: Event
+        day: Ngay
+        user: Nguoi dung
 
     new:
       title: Event moi

config/settings.yml

@@ -39,3 +39,4 @@ no_room: "-1"
 calendar: "calendar"
 version: "v3"
 avatar_extension_white_list: ["jpeg", "jpg", "png"]
+error: "error"