modifications for pull to release-10

greenriver · Jul 3, 2017 · 2048608 · 2048608
1 parent 50da867
commit 2048608
Show file tree

Hide file tree

Showing 13 changed files with 8 additions and 80 deletions.
diff --git a/app/controllers/admin/translation_keys_controller.rb b/app/controllers/admin/translation_keys_controller.rb
@@ -40,7 +40,6 @@ def authorized?
 
     def show
       @skip_authorization = true
-
       render action: :edit
     end
 
@@ -50,7 +49,6 @@ def edit
     end
 
     def update
-      console
       if @translation_key.update(translation_key_params)
         flash[:notice] = 'Saved!'
         redirect_to @translation_key

diff --git a/app/views/admin/translation_keys/edit.html.haml b/app/views/admin/translation_keys/edit.html.haml
diff --git a/app/views/admin/translation_keys/index.html.haml b/app/views/admin/translation_keys/index.html.haml
@@ -1,7 +1,5 @@
 - locales = TranslationKey.available_locales
-
-
-
+
 .row.table-utilities
   .col-sm-4
     %p= page_entries_info @translation_keys

diff --git a/config/initializers/fast_gettext.rb b/config/initializers/fast_gettext.rb
@@ -10,5 +10,5 @@
   :ignore_fuzzy => true,
   # :report_warning => false
 )
-FastGettext.default_available_locales = ['en', 'fr']
+FastGettext.default_available_locales = ['en']
 FastGettext.default_text_domain = 'hmis_warehouse'
diff --git a/config/routes.rb b/config/routes.rb
@@ -228,7 +228,7 @@ def healthcare_routes
       end
       resources :roles, only: [:index]
     end
-    resources :translation_keys
+    resources :translation_keys, only: [:index, :update]
     resources :translation_text, only: [:update]
   end
   resource :account, only: [:edit, :update]

diff --git a/db/migrate/20170627154145_create_translation_tables.rb b/db/migrate/20170627154145_create_translation_tables.rb
@@ -1,7 +1,7 @@
 class CreateTranslationTables < ActiveRecord::Migration
   def self.up
     create_table :translation_keys do |t|
-      t.string :key, :unique=>true, :null=>false
+      t.string :key, :unique=>true, :null=>false, default: ''
       t.timestamps
     end
     add_index :translation_keys, :key #I am not sure if this helps....

diff --git a/lib/tasks/sync_po_to_db.rake b/lib/tasks/sync_po_to_db.rake
@@ -2,7 +2,6 @@ desc "synchronise po files with db, creating keys and translations that do not e
 task :sync_po_to_db => :environment do
   folder = ENV['FOLDER']||'locale'
 
-  gem 'grosser-pomo', '>=0.5.1'
   require 'pomo'
   require 'pathname'
 

diff --git a/locale/en/hmis_warehouse.edit.po b/locale/en/hmis_warehouse.edit.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hmis_warehouse 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-03 15:41-0400\n"
+"POT-Creation-Date: 2017-07-03 16:24-0400\n"
 "PO-Revision-Date: 2017-06-30 14:13-0400\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: English\n"

diff --git a/locale/fr/hmis_warehouse.edit.po b/locale/fr/hmis_warehouse.edit.po
diff --git a/locale/fr/hmis_warehouse.po b/locale/fr/hmis_warehouse.po
diff --git a/locale/fr/hmis_warehouse.po.time_stamp b/locale/fr/hmis_warehouse.po.time_stamp
diff --git a/locale/hmis_warehouse.pot b/locale/hmis_warehouse.pot
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hmis_warehouse 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-03 15:41-0400\n"
-"PO-Revision-Date: 2017-07-03 15:41-0400\n"
+"POT-Creation-Date: 2017-07-03 16:24-0400\n"
+"PO-Revision-Date: 2017-07-03 16:24-0400\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"

diff --git a/public/502.html b/public/502.html
@@ -78,8 +78,7 @@ <h3 class="secondary-header">Boston DND Warehouse is offline for a moment while
       </div>
     </main>
     <footer class="footer">
-      <p>The Boston DND Warehouse is operated by the 
-Department of Neighborhood Development as the lead agency of the Boston Continuum of Care.</p>
+      <p>The Boston DND Warehouse is operated by the Department of Neighborhood Development as the lead agency of the Boston Continuum of Care.</p>
     </footer>
   </body>
 </html>