From 26923740add5b0d0761f9fdec8b4b6289b984696 Mon Sep 17 00:00:00 2001 From: Vladimir Sharshov Date: Fri, 3 Feb 2012 01:30:08 +0400 Subject: [PATCH] Hot fix for en yml Add new schema.rb --- config/locales/en.yml | 170 +++++++++++++++++++++--------------------- db/schema.rb | 14 ++-- 2 files changed, 94 insertions(+), 90 deletions(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index bcbeda9f5..0e21872d3 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -947,96 +947,96 @@ en: issue_assign_notification: New task assigned new_commit_comment_notification: New comment to commit - project: - category_id: Category - name: Name - description: Descripton - owner: Owner - visibility: Visibility - repository_id: Repository - repository: Repository - created_at: Created - updated_at: Updated - has_issues: Tracker on - srpm: Import code from src.rpm + project: + category_id: Category + name: Name + description: Descripton + owner: Owner + visibility: Visibility + repository_id: Repository + repository: Repository + created_at: Created + updated_at: Updated + has_issues: Tracker on + srpm: Import code from src.rpm - rpm: - name: Name - arch_id: Arch - arch: Arch - project_id: Project - project: Project - created_at: Created - updated_at: Updated + rpm: + name: Name + arch_id: Arch + arch: Arch + project_id: Project + project: Project + created_at: Created + updated_at: Updated - role: - name: Name - on: Slave - to: Master - use_default: By default - use_default_for_owner: Default by owner + role: + name: Name + on: Slave + to: Master + use_default: By default + use_default_for_owner: Default by owner - group: - name: Name - uname: Nickname - owner: Owner - created_at: Created - updated_at: Updated + group: + name: Name + uname: Nickname + owner: Owner + created_at: Created + updated_at: Updated - user: - name: User - login: Nickname or Email - email: Email - uname: Nickname - ssh_key: SSH key - current_password: Current password - role: Role - created_at: Created - updated_at: Updated - role: System role - language: Language + user: + name: User + login: Nickname or Email + email: Email + uname: Nickname + ssh_key: SSH key + current_password: Current password + role: Role + created_at: Created + updated_at: Updated + role: System role + language: Language - product_build_list: - id: Id - product: Product - status: Status - notified_at: Notified at + product_build_list: + id: Id + product: Product + status: Status + notified_at: Notified at - build_list: - bs_id: Id - name: Name - container_path: Container path - status: Status - project_id: Project - project: Project - arch_id: Architecture - arch: Architecture - is_circle: Recurrent - notified_at: Notified at - additional_repos: Additional repository - include_repos: Includes repository - updated_at: Updated - created_at: Created - pl: Packet list repository - pl_id: Packet list repository - bpl: Platform - bpl_id: Platform - update_type: Update type - build_requires: Dependable build requires - auto_publish: Automated publising - project_version: Version - user: User + build_list: + bs_id: Id + name: Name + container_path: Container path + status: Status + project_id: Project + project: Project + arch_id: Architecture + arch: Architecture + is_circle: Recurrent + notified_at: Notified at + additional_repos: Additional repository + include_repos: Includes repository + updated_at: Updated + created_at: Created + pl: Packet list repository + pl_id: Packet list repository + bpl: Platform + bpl_id: Platform + update_type: Update type + build_requires: Dependable build requires + auto_publish: Automated publising + project_version: Version + user: User - build_list/item: - name: Name - level: Level - status: Status - version: Version - build_list: Build list + build_list/item: + name: Name + level: Level + status: Status + version: Version + build_list: Build list - download: - name: Name - version: Version - distro: Source - platform: Platform - counter: Downloads + download: + name: Name + version: Version + distro: Source + platform: Platform + counter: Downloads diff --git a/db/schema.rb b/db/schema.rb index b15a8ad77..ad2ca6d65 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -153,6 +153,7 @@ ActiveRecord::Schema.define(:version => 20120131124517) do t.datetime "created_at" t.datetime "updated_at" t.string "uname" + t.integer "own_projects_count", :default => 0, :null => false end create_table "issues", :force => true do |t| @@ -256,6 +257,7 @@ ActiveRecord::Schema.define(:version => 20120131124517) do t.string "srpm_content_type" t.integer "srpm_file_size" t.datetime "srpm_updated_at" + t.boolean "has_wiki", :default => false end add_index "projects", ["category_id"], :name => "index_projects_on_category_id" @@ -312,23 +314,25 @@ ActiveRecord::Schema.define(:version => 20120131124517) do t.integer "user_id" t.datetime "created_at" t.datetime "updated_at" - t.integer "project_id" t.boolean "status", :default => true + t.integer "project_id" end create_table "users", :force => true do |t| t.string "name" - t.string "email", :default => "", :null => false - t.string "encrypted_password", :limit => 128, :default => "", :null => false + t.string "email", :default => "", :null => false + t.string "encrypted_password", :limit => 128, :default => "", :null => false + t.string "password_salt", :default => "", :null => false t.string "reset_password_token" - t.datetime "reset_password_sent_at" + t.string "remember_token" t.datetime "remember_created_at" t.datetime "created_at" t.datetime "updated_at" t.text "ssh_key" t.string "uname" t.string "role" - t.string "language", :default => "en" + t.string "language", :default => "en" + t.integer "own_projects_count", :default => 0, :null => false end add_index "users", ["email"], :name => "index_users_on_email", :unique => true