Browse Source

Fixed IE issue and finished English translations

development
Godwin 9 years ago
parent
commit
8a05ac6e31
  1. 2
      app/assets/stylesheets/application.scss
  2. 221
      config/locales/en.yml
  3. 180
      db/schema.rb

2
app/assets/stylesheets/application.scss

@ -1,7 +1,7 @@
@import "bumbleberry"; @import "bumbleberry";
@import "settings"; @import "settings";
body { html, body {
color: #333; color: #333;
position: relative; position: relative;
z-index: -1; z-index: -1;

221
config/locales/en.yml

@ -32,15 +32,15 @@ en:
- Friday - Friday
- Saturday - Saturday
formats: formats:
default: '%Y-%m-%d' default: "%Y-%m-%d"
long: '%B %d, %Y' long: "%B %d, %Y"
short: '%b %d' short: "%b %d"
span_same_month_date_1: '%B %e' span_same_month_date_1: "%B %e"
span_same_month_date_2: '%e, %Y' span_same_month_date_2: "%e, %Y"
span_same_year_date_1: '%B %e' span_same_year_date_1: "%B %e"
span_same_year_date_2: '%B %e, %Y' span_same_year_date_2: "%B %e, %Y"
span_different_year_date_1: '%B %e, %Y' span_different_year_date_1: "%B %e, %Y"
span_different_year_date_2: '%B %e, %Y' span_different_year_date_2: "%B %e, %Y"
month_names: month_names:
- -
- January - January
@ -59,7 +59,7 @@ en:
- year - year
- month - month
- day - day
date_span: '%{date_1} – %{date_2}' date_span: "%{date_1} – %{date_2}"
datetime: datetime:
distance_in_words: distance_in_words:
about_x_hours: about_x_hours:
@ -86,16 +86,16 @@ en:
other: over %{count} years other: over %{count} years
x_days: x_days:
one: 1 day one: 1 day
other: '%{count} days' other: "%{count} days"
x_minutes: x_minutes:
one: 1 minute one: 1 minute
other: '%{count} minutes' other: "%{count} minutes"
x_months: x_months:
one: 1 month one: 1 month
other: '%{count} months' other: "%{count} months"
x_seconds: x_seconds:
one: 1 second one: 1 second
other: '%{count} seconds' other: "%{count} seconds"
prompts: prompts:
day: Day day: Day
hour: Hour hour: Hour
@ -104,7 +104,7 @@ en:
second: Seconds second: Seconds
year: Year year: Year
errors: errors:
format: '%{attribute} %{message}' format: "%{attribute} %{message}"
messages: messages:
accepted: must be accepted accepted: must be accepted
blank: can't be blank blank: can't be blank
@ -155,7 +155,7 @@ en:
body: 'There were problems with the following fields:' body: 'There were problems with the following fields:'
header: header:
one: 1 error prohibited this %{model} from being saved one: 1 error prohibited this %{model} from being saved
other: '%{count} errors prohibited this %{model} from being saved' other: "%{count} errors prohibited this %{model} from being saved"
helpers: helpers:
select: select:
prompt: Please select prompt: Please select
@ -166,22 +166,22 @@ en:
number: number:
currency: currency:
format: format:
delimiter: ',' delimiter: ","
format: '%u%n' format: "%u%n"
precision: 2 precision: 2
separator: . separator: "."
significant: false significant: false
strip_insignificant_zeros: false strip_insignificant_zeros: false
unit: $ unit: "$"
format: format:
delimiter: ',' delimiter: ","
precision: 3 precision: 3
separator: . separator: "."
significant: false significant: false
strip_insignificant_zeros: false strip_insignificant_zeros: false
human: human:
decimal_units: decimal_units:
format: '%n %u' format: "%n %u"
units: units:
billion: Billion billion: Billion
million: Million million: Million
@ -195,7 +195,7 @@ en:
significant: true significant: true
strip_insignificant_zeros: true strip_insignificant_zeros: true
storage_units: storage_units:
format: '%n %u' format: "%n %u"
units: units:
byte: byte:
one: Byte one: Byte
@ -207,21 +207,21 @@ en:
percentage: percentage:
format: format:
delimiter: '' delimiter: ''
format: '%n%' format: "%n%"
precision: precision:
format: format:
delimiter: '' delimiter: ''
support: support:
array: array:
last_word_connector: ', and ' last_word_connector: ", and "
two_words_connector: ' and ' two_words_connector: " and "
words_connector: ', ' words_connector: ", "
time: time:
am: am am: am
formats: formats:
default: '%a, %d %b %Y %H:%M:%S %z' default: "%a, %d %b %Y %H:%M:%S %z"
long: '%B %d, %Y' long: "%B %d, %Y"
short: '%d %b %H:%M' short: "%d %b %H:%M"
pm: pm pm: pm
languages: languages:
af: Afrikaans af: Afrikaans
@ -286,6 +286,8 @@ en:
uz: Uzbek uz: Uzbek
vi: Vietnamese vi: Vietnamese
wo: Wolof wo: Wolof
be: Belarusian
tt: Tatar
geography: geography:
countries: countries:
AD: Andorra AD: Andorra
@ -302,7 +304,7 @@ en:
AT: Austria AT: Austria
AU: Australia AU: Australia
AW: Aruba AW: Aruba
AX: Åland AX: "Åland"
AZ: Azerbaijan AZ: Azerbaijan
BA: Bosnia and Herzegovina BA: Bosnia and Herzegovina
BB: Barbados BB: Barbados
@ -994,9 +996,9 @@ en:
- Zambia - Zambia
- Zimbabwe - Zimbabwe
street_address: street_address:
- '#####' - "#####"
- '####' - "####"
- '###' - "###"
street_suffix: street_suffix:
- Alley - Alley
- Avenue - Avenue
@ -1227,8 +1229,8 @@ en:
- 'Apt. ###' - 'Apt. ###'
- 'Suite ###' - 'Suite ###'
postcode: postcode:
- '#####' - "#####"
- '#####-####' - "#####-####"
state: state:
- Alabama - Alabama
- Alaska - Alaska
@ -5131,37 +5133,37 @@ en:
- :last_name - :last_name
phone_number: phone_number:
formats: formats:
- '###-###-####' - "###-###-####"
- (###)###-#### - "(###)###-####"
- 1-###-###-#### - 1-###-###-####
- '###.###.####' - "###.###.####"
- '###-###-####' - "###-###-####"
- (###)###-#### - "(###)###-####"
- 1-###-###-#### - 1-###-###-####
- '###.###.####' - "###.###.####"
- '###-###-#### x###' - "###-###-#### x###"
- (###)###-#### x### - "(###)###-#### x###"
- 1-###-###-#### x### - 1-###-###-#### x###
- '###.###.#### x###' - "###.###.#### x###"
- '###-###-#### x####' - "###-###-#### x####"
- (###)###-#### x#### - "(###)###-#### x####"
- 1-###-###-#### x#### - 1-###-###-#### x####
- '###.###.#### x####' - "###.###.#### x####"
- '###-###-#### x#####' - "###-###-#### x#####"
- (###)###-#### x##### - "(###)###-#### x#####"
- 1-###-###-#### x##### - 1-###-###-#### x#####
- '###.###.#### x#####' - "###.###.#### x#####"
translate: translate:
pages: pages:
Locale_Translations: '%{language} Translations' Locale_Translations: "%{language} Translations"
Enabled_Locales: Enabled Locales Enabled_Locales: Enabled Locales
Incomplete_Locales: Incomplete Locales Incomplete_Locales: Incomplete Locales
Other_Locales: Other Locales Other_Locales: Other Locales
pages: 'Pages:' pages: 'Pages:'
context_title: 'Context:' context_title: 'Context:'
context: context:
one: '%{context}' one: "%{context}"
other: '%{context} (× %{count})' other: "%{context} (× %{count})"
contexts: contexts:
character: character character: character
sentence: sentence sentence: sentence
@ -5207,20 +5209,20 @@ en:
become_a_volunteer: Become a volunteer translator become_a_volunteer: Become a volunteer translator
volunteer: Can you help us translate it? volunteer: Can you help us translate it?
site: site:
locale_is_available: '%{site_name} is available in %{language}.' locale_is_available: "%{site_name} is available in %{language}."
go_to_locale: See the %{language} site now go_to_locale: See the %{language} site now
locale_not_available: Sorry, %{site_name} is not currently available in %{language}. locale_not_available: Sorry, %{site_name} is not currently available in %{language}.
locale_needs_help: Can you help us translate the site into %{language}? locale_needs_help: Can you help us translate the site into %{language}?
translation_pages: translation_pages:
Locale_Translations: '%{language} Translations' Locale_Translations: "%{language} Translations"
Enabled_Locales: Enabled Locales Enabled_Locales: Enabled Locales
Incomplete_Locales: Incomplete Locales Incomplete_Locales: Incomplete Locales
Other_Locales: Other Locales Other_Locales: Other Locales
pages: 'Pages:' pages: 'Pages:'
context_title: 'Context:' context_title: 'Context:'
context: context:
one: '%{context}' one: "%{context}"
other: '%{context} (× %{count})' other: "%{context} (× %{count})"
contexts: contexts:
character: character character: character
sentence: sentence sentence: sentence
@ -5304,6 +5306,11 @@ en:
name: What is your name? name: What is your name?
Payment: Payment Payment: Payment
payment: Fees paid payment: Fees paid
Allergies: Allergies
Stats: Stats
Workshops: Workshops
Your_Workshops: Your Workshops
payment_confirm: Please confirm your payment
paragraphs: paragraphs:
Policy_Agreement: Safer Space Agreement Policy_Agreement: Safer Space Agreement
Confirm_Agreement: By clicking the "I Agree" button, you are pledging to do Confirm_Agreement: By clicking the "I Agree" button, you are pledging to do
@ -5316,7 +5323,7 @@ en:
Payment is by donation and can be done now or upon arrival but to help us Payment is by donation and can be done now or upon arrival but to help us
fund the conference, we ask that you pay the registration donation as soon fund the conference, we ask that you pay the registration donation as soon
as you can. as you can.
currency: (amounts are in $USD) currency: "(amounts are in $USD)"
email_confirm: Go to your inbox! You should see an email from Bike!Bike! in email_confirm: Go to your inbox! You should see an email from Bike!Bike! in
just a few moments. There will be a link in the email for you to click on. just a few moments. There will be a link in the email for you to click on.
Check your spam box if you do not see it. If you encounter any problems, Check your spam box if you do not see it. If you encounter any problems,
@ -5334,6 +5341,8 @@ en:
Stats: Check Out who's coming and what they've paid so far. See at a glance Stats: Check Out who's coming and what they've paid so far. See at a glance
how much accommodation is needed and what people prefer to eat. how much accommodation is needed and what people prefer to eat.
done: Thank you for registering for Bike!Bike! done: Thank you for registering for Bike!Bike!
Email_Participants: Email Participants
payment_confirm: You are about to confirm your payment of %{amount} for registration.
questions: questions:
bike: bike:
large: Large large: Large
@ -5348,7 +5357,19 @@ en:
house: Indoor Location house: Indoor Location
none: I'll take care of it none: I'll take care of it
tent: Tent Space tent: Tent Space
none: (none) none: "(none)"
actions:
View_Workshops: View Workshops
notes:
Test_Email_Sent: An email was sent to %{email_address}
terms:
Bikes: Bikes
Donation_Count: Donation Count
Food: Food
Housing: Housing
Languages: Languages
Total_Donations: Total Donations
Total_Registrations: Total Registrations
about_bikebike: about_bikebike:
paragraphs: paragraphs:
bicycle_project_paragraph: 'Bike!Bike! 2015: An international reunion meant bicycle_project_paragraph: 'Bike!Bike! 2015: An international reunion meant
@ -5399,6 +5420,28 @@ en:
Amenities: Where can I stay? What can I eat? How can I get around? Amenities: Where can I stay? What can I eat? How can I get around?
Volunteer: Can I volunteer? Volunteer: Can I volunteer?
What_is_BikeBike: What is Bike!Bike!? What_is_BikeBike: What is Bike!Bike!?
permission_denied:
headings:
confirm_email: Please confirm your email address
login_required: Login Required
paragraphs:
translator_not_logged_in: You must be a translator and logged in to view this
page. If you are already a translator please confirm your email address
to proceed. If you would like to become a translator you can request to
become one after logging in.
workshops:
headings:
facilitators: Facilitators
languages: Languages
needs: Needs
space: Space
theme: Theme
paragraphs:
info: Description
space: What kind of space do you need for your workshop?
theme: Which of the themes below best match your workshop? This will help
hosts to avoid scheduling conflicts. Select other if none of the options
match in any way.
section_content: section_content:
bikebike: bikebike:
about_bikebike: Bike!Bike! is an international annual gathering organized by about_bikebike: Bike!Bike! is an international annual gathering organized by
@ -5415,6 +5458,10 @@ en:
departure: Departure date departure: Departure date
location: City, State/Province, Country location: City, State/Province, Country
name: Name name: Name
subject: Subject
title: Title
info: Info
content: Content
actions: actions:
generic: generic:
login: Sign In login: Sign In
@ -5423,17 +5470,30 @@ en:
custom_amount: Custom amount custom_amount: Custom amount
edit_registration: Edit my registration edit_registration: Edit my registration
register: Register register: Register
save: Save
test: Test
preview: Preview
confirm_amount: Confirm
page_titles: page_titles:
'403': '403':
Please_Confirm_Email: Please confirm your email Please_Confirm_Email: Please confirm your email
Please_Check_Email: Please check your email
Please_Login: Please login
Safe_Space_Policy: Safer Space Agreement Safe_Space_Policy: Safer Space Agreement
About_BikeBike: About Bike!Bike! About_BikeBike: About Bike!Bike!
about: about:
About_BikeBike: About Bike!Bike! About_BikeBike: About Bike!Bike!
conferences: conferences:
Conference_Registration: Conference Registration Conference_Registration: Conference Registration
Create_Workshop: Create a Workshop
Email_Participants: Email Participants
Registration_Stats: Registration Stats
View_Workshop: View Workshop
Workshops: Workshops
policy: policy:
Safer_Spaces_Policy: Safer Space Agreement Safer_Spaces_Policy: Safer Space Agreement
'404':
Page_Not_Found: Page Not Found
links: links:
footer: footer:
help_text: help_text:
@ -5453,6 +5513,45 @@ en:
registration: registration:
Registration: Registration Registration: Registration
Workshops: Workshops Workshops: Workshops
Stats: Stats
Broadcast: Broadcast
actions: actions:
workshops: workshops:
create: New Workshop create: New Workshop
Delete: Delete Workshop
Edit: Edit
error:
'404':
description: Sorry, we couldn't find the page you were looking for. If you really
believe that it should exist please contact admin@bikebike.org or file an
issue on github: https://github.com/bikebike/BikeBike/issues
title: '404: This page doesn''t exist'
roles:
workshops:
facilitator:
creator: creator
workshop:
options:
needs:
projector: Projector
sound: Sound System
tools: Tools
space:
meeting_room: Meeting Room
outdoor_meeting: Outdoor Space
workshop: Collaborative Workshop
theme:
community: Community Outreach
funding: Funding
mechanics: Mechanics
organization: Organizational Concerns
other: Other
race_gender: Race, Gender, or Class Politics
email:
confirmation:
paragraph:
please_confirm: 'Hello! To gain access to registration and other features
of Bike!Bike!, please confirm your email address by clicking on following
link:'
subject:
confirm_email: Confirmation Email

180
db/schema.rb

@ -11,15 +11,15 @@
# #
# It's strongly recommended that you check this file into your version control system. # It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema.define(version: 20150819042431) do ActiveRecord::Schema.define(version: 20150804032547) do
# These are extensions that must be enabled in order to support this database # These are extensions that must be enabled in order to support this database
enable_extension "plpgsql" enable_extension "plpgsql"
create_table "authentications", force: :cascade do |t| create_table "authentications", force: :cascade do |t|
t.integer "user_id", null: false t.integer "user_id", null: false
t.string "provider", limit: 255, null: false t.string "provider", null: false
t.string "uid", limit: 255, null: false t.string "uid", null: false
t.datetime "created_at" t.datetime "created_at"
t.datetime "updated_at" t.datetime "updated_at"
end end
@ -58,19 +58,19 @@ ActiveRecord::Schema.define(version: 20150819042431) do
create_table "conference_registrations", force: :cascade do |t| create_table "conference_registrations", force: :cascade do |t|
t.integer "conference_id" t.integer "conference_id"
t.integer "user_id" t.integer "user_id"
t.string "is_attending", limit: 255 t.string "is_attending"
t.datetime "created_at" t.datetime "created_at"
t.datetime "updated_at" t.datetime "updated_at"
t.boolean "is_confirmed" t.boolean "is_confirmed"
t.boolean "is_participant" t.boolean "is_participant"
t.boolean "is_volunteer" t.boolean "is_volunteer"
t.string "confirmation_token", limit: 255 t.string "confirmation_token"
t.binary "data" t.binary "data"
t.string "email", limit: 255 t.string "email"
t.boolean "complete" t.boolean "complete"
t.boolean "completed" t.boolean "completed"
t.string "payment_confirmation_token", limit: 255 t.string "payment_confirmation_token"
t.string "payment_info", limit: 255 t.string "payment_info"
t.integer "registration_fees_paid" t.integer "registration_fees_paid"
t.string "city" t.string "city"
t.datetime "arrival" t.datetime "arrival"
@ -78,27 +78,24 @@ ActiveRecord::Schema.define(version: 20150819042431) do
t.string "housing" t.string "housing"
t.string "bike" t.string "bike"
t.text "other" t.text "other"
t.string "allergies"
t.string "languages"
t.string "food"
end end
create_table "conference_types", force: :cascade do |t| create_table "conference_types", force: :cascade do |t|
t.string "title", limit: 255 t.string "title"
t.string "info", limit: 255 t.string "info"
t.datetime "created_at" t.datetime "created_at"
t.datetime "updated_at" t.datetime "updated_at"
t.string "slug", limit: 255 t.string "slug"
end end
create_table "conferences", force: :cascade do |t| create_table "conferences", force: :cascade do |t|
t.string "title", limit: 255 t.string "title"
t.string "slug", limit: 255 t.string "slug"
t.datetime "start_date" t.datetime "start_date"
t.datetime "end_date" t.datetime "end_date"
t.text "info" t.text "info"
t.string "poster", limit: 255 t.string "poster"
t.string "cover", limit: 255 t.string "cover"
t.boolean "workshop_schedule_published" t.boolean "workshop_schedule_published"
t.boolean "registration_open" t.boolean "registration_open"
t.boolean "meals_provided" t.boolean "meals_provided"
@ -111,8 +108,8 @@ ActiveRecord::Schema.define(version: 20150819042431) do
t.text "registration_info" t.text "registration_info"
t.text "postregistration_info" t.text "postregistration_info"
t.integer "cover_attribution_id" t.integer "cover_attribution_id"
t.string "cover_attribution_name", limit: 255 t.string "cover_attribution_name"
t.string "cover_attribution_src", limit: 255 t.string "cover_attribution_src"
t.integer "cover_attribution_user_id" t.integer "cover_attribution_user_id"
t.string "locale" t.string "locale"
t.string "email_address" t.string "email_address"
@ -122,22 +119,6 @@ ActiveRecord::Schema.define(version: 20150819042431) do
t.string "paypal_signature" t.string "paypal_signature"
end end
create_table "delayed_jobs", force: :cascade do |t|
t.integer "priority", default: 0, null: false
t.integer "attempts", default: 0, null: false
t.text "handler", null: false
t.text "last_error"
t.datetime "run_at"
t.datetime "locked_at"
t.datetime "failed_at"
t.string "locked_by"
t.string "queue"
t.datetime "created_at"
t.datetime "updated_at"
end
add_index "delayed_jobs", ["priority", "run_at"], name: "delayed_jobs_priority", using: :btree
create_table "dynamic_translation_records", force: :cascade do |t| create_table "dynamic_translation_records", force: :cascade do |t|
t.string "locale" t.string "locale"
t.integer "translator_id" t.integer "translator_id"
@ -158,15 +139,15 @@ ActiveRecord::Schema.define(version: 20150819042431) do
end end
create_table "event_types", force: :cascade do |t| create_table "event_types", force: :cascade do |t|
t.string "slug", limit: 255 t.string "slug"
t.text "info" t.text "info"
t.datetime "created_at" t.datetime "created_at"
t.datetime "updated_at" t.datetime "updated_at"
end end
create_table "events", force: :cascade do |t| create_table "events", force: :cascade do |t|
t.string "title", limit: 255 t.string "title"
t.string "slug", limit: 255 t.string "slug"
t.integer "event_type_id" t.integer "event_type_id"
t.integer "conference_id" t.integer "conference_id"
t.text "info" t.text "info"
@ -178,16 +159,16 @@ ActiveRecord::Schema.define(version: 20150819042431) do
end end
create_table "locations", force: :cascade do |t| create_table "locations", force: :cascade do |t|
t.string "title", limit: 255 t.string "title"
t.float "latitude" t.float "latitude"
t.float "longitude" t.float "longitude"
t.datetime "created_at" t.datetime "created_at"
t.datetime "updated_at" t.datetime "updated_at"
t.string "country", limit: 255 t.string "country"
t.string "territory", limit: 255 t.string "territory"
t.string "city", limit: 255 t.string "city"
t.string "street", limit: 255 t.string "street"
t.string "postal_code", limit: 255 t.string "postal_code"
end end
add_index "locations", ["latitude", "longitude"], name: "index_locations_on_latitude_and_longitude", using: :btree add_index "locations", ["latitude", "longitude"], name: "index_locations_on_latitude_and_longitude", using: :btree
@ -200,50 +181,50 @@ ActiveRecord::Schema.define(version: 20150819042431) do
add_index "locations_organizations", ["organization_id", "location_id"], name: "loc_org_index", using: :btree add_index "locations_organizations", ["organization_id", "location_id"], name: "loc_org_index", using: :btree
create_table "organization_statuses", force: :cascade do |t| create_table "organization_statuses", force: :cascade do |t|
t.string "name", limit: 255 t.string "name"
t.string "slug", limit: 255 t.string "slug"
t.string "info", limit: 255 t.string "info"
t.datetime "created_at" t.datetime "created_at"
t.datetime "updated_at" t.datetime "updated_at"
end end
create_table "organizations", force: :cascade do |t| create_table "organizations", force: :cascade do |t|
t.string "name", limit: 255 t.string "name"
t.string "slug", limit: 255 t.string "slug"
t.string "email_address", limit: 255 t.string "email_address"
t.string "url", limit: 255 t.string "url"
t.integer "year_founded" t.integer "year_founded"
t.text "info" t.text "info"
t.string "logo", limit: 255 t.string "logo"
t.string "avatar", limit: 255 t.string "avatar"
t.boolean "requires_approval" t.boolean "requires_approval"
t.string "secret_question", limit: 255 t.string "secret_question"
t.string "secret_answer", limit: 255 t.string "secret_answer"
t.integer "user_organization_replationship_id" t.integer "user_organization_replationship_id"
t.datetime "created_at" t.datetime "created_at"
t.datetime "updated_at" t.datetime "updated_at"
t.string "cover", limit: 255 t.string "cover"
t.integer "cover_attribution_id" t.integer "cover_attribution_id"
t.string "cover_attribution_name", limit: 255 t.string "cover_attribution_name"
t.string "cover_attribution_src", limit: 255 t.string "cover_attribution_src"
t.string "phone", limit: 255 t.string "phone"
t.integer "organization_status_id" t.integer "organization_status_id"
t.integer "cover_attribution_user_id" t.integer "cover_attribution_user_id"
end end
create_table "registration_form_fields", force: :cascade do |t| create_table "registration_form_fields", force: :cascade do |t|
t.string "title", limit: 255 t.string "title"
t.text "help" t.text "help"
t.boolean "required" t.boolean "required"
t.string "field_type", limit: 255 t.string "field_type"
t.string "options", limit: 255 t.string "options"
t.boolean "is_retired" t.boolean "is_retired"
t.datetime "created_at" t.datetime "created_at"
t.datetime "updated_at" t.datetime "updated_at"
end end
create_table "sessions", force: :cascade do |t| create_table "sessions", force: :cascade do |t|
t.string "session_id", limit: 255, null: false t.string "session_id", null: false
t.text "data" t.text "data"
t.datetime "created_at" t.datetime "created_at"
t.datetime "updated_at" t.datetime "updated_at"
@ -261,8 +242,8 @@ ActiveRecord::Schema.define(version: 20150819042431) do
end end
create_table "translations", force: :cascade do |t| create_table "translations", force: :cascade do |t|
t.string "locale", limit: 255 t.string "locale"
t.string "key", limit: 255 t.string "key"
t.text "value" t.text "value"
t.text "interpolations" t.text "interpolations"
t.boolean "is_proc", default: false t.boolean "is_proc", default: false
@ -273,34 +254,34 @@ ActiveRecord::Schema.define(version: 20150819042431) do
create_table "user_organization_relationships", force: :cascade do |t| create_table "user_organization_relationships", force: :cascade do |t|
t.integer "user_id" t.integer "user_id"
t.integer "organization_id" t.integer "organization_id"
t.string "relationship", limit: 255 t.string "relationship"
t.datetime "created_at" t.datetime "created_at"
t.datetime "updated_at" t.datetime "updated_at"
end end
create_table "users", force: :cascade do |t| create_table "users", force: :cascade do |t|
t.string "username" t.string "username", null: false
t.string "email", limit: 255 t.string "email"
t.string "crypted_password", limit: 255 t.string "crypted_password"
t.string "salt", limit: 255 t.string "salt"
t.datetime "created_at" t.datetime "created_at"
t.datetime "updated_at" t.datetime "updated_at"
t.string "remember_me_token", limit: 255 t.string "remember_me_token"
t.datetime "remember_me_token_expires_at" t.datetime "remember_me_token_expires_at"
t.string "reset_password_token", limit: 255 t.string "reset_password_token"
t.datetime "reset_password_token_expires_at" t.datetime "reset_password_token_expires_at"
t.datetime "reset_password_email_sent_at" t.datetime "reset_password_email_sent_at"
t.string "activation_state", limit: 255 t.string "activation_state"
t.string "activation_token", limit: 255 t.string "activation_token"
t.datetime "activation_token_expires_at" t.datetime "activation_token_expires_at"
t.integer "failed_logins_count", default: 0 t.integer "failed_logins_count", default: 0
t.datetime "lock_expires_at" t.datetime "lock_expires_at"
t.string "unlock_token", limit: 255 t.string "unlock_token"
t.string "avatar", limit: 255 t.string "avatar"
t.text "about_me" t.text "about_me"
t.string "role", limit: 255 t.string "role"
t.string "firstname", limit: 255 t.string "firstname"
t.string "lastname", limit: 255 t.string "lastname"
t.boolean "is_translator" t.boolean "is_translator"
end end
@ -309,27 +290,27 @@ ActiveRecord::Schema.define(version: 20150819042431) do
add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", using: :btree add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", using: :btree
create_table "versions", force: :cascade do |t| create_table "versions", force: :cascade do |t|
t.string "item_type", limit: 255 t.string "item_type"
t.integer "item_id" t.integer "item_id"
t.string "event", limit: 255 t.string "event"
t.string "whodunnit", limit: 255 t.string "whodunnit"
t.text "object" t.text "object"
t.datetime "created_at" t.datetime "created_at"
t.string "value", limit: 255 t.string "value"
end end
create_table "workshop_facilitators", force: :cascade do |t| create_table "workshop_facilitators", force: :cascade do |t|
t.integer "user_id" t.integer "user_id"
t.integer "workshop_id" t.integer "workshop_id"
t.string "role", limit: 255 t.string "role"
t.datetime "created_at" t.datetime "created_at"
t.datetime "updated_at" t.datetime "updated_at"
end end
create_table "workshop_presentation_styles", force: :cascade do |t| create_table "workshop_presentation_styles", force: :cascade do |t|
t.string "name", limit: 255 t.string "name"
t.string "slug", limit: 255 t.string "slug"
t.string "info", limit: 255 t.string "info"
t.datetime "created_at" t.datetime "created_at"
t.datetime "updated_at" t.datetime "updated_at"
t.integer "order" t.integer "order"
@ -338,31 +319,31 @@ ActiveRecord::Schema.define(version: 20150819042431) do
create_table "workshop_requested_resources", force: :cascade do |t| create_table "workshop_requested_resources", force: :cascade do |t|
t.integer "workshop_id" t.integer "workshop_id"
t.integer "workshop_resource_id" t.integer "workshop_resource_id"
t.string "status", limit: 255 t.string "status"
t.datetime "created_at" t.datetime "created_at"
t.datetime "updated_at" t.datetime "updated_at"
end end
create_table "workshop_resources", force: :cascade do |t| create_table "workshop_resources", force: :cascade do |t|
t.string "name", limit: 255 t.string "name"
t.string "slug", limit: 255 t.string "slug"
t.string "info", limit: 255 t.string "info"
t.datetime "created_at" t.datetime "created_at"
t.datetime "updated_at" t.datetime "updated_at"
end end
create_table "workshop_streams", force: :cascade do |t| create_table "workshop_streams", force: :cascade do |t|
t.string "name", limit: 255 t.string "name"
t.string "slug", limit: 255 t.string "slug"
t.string "info", limit: 255 t.string "info"
t.datetime "created_at" t.datetime "created_at"
t.datetime "updated_at" t.datetime "updated_at"
t.integer "order" t.integer "order"
end end
create_table "workshops", force: :cascade do |t| create_table "workshops", force: :cascade do |t|
t.string "title", limit: 255 t.string "title"
t.string "slug", limit: 255 t.string "slug"
t.text "info" t.text "info"
t.integer "conference_id" t.integer "conference_id"
t.integer "workshop_stream_id" t.integer "workshop_stream_id"
@ -373,11 +354,6 @@ ActiveRecord::Schema.define(version: 20150819042431) do
t.datetime "end_time" t.datetime "end_time"
t.datetime "created_at" t.datetime "created_at"
t.datetime "updated_at" t.datetime "updated_at"
t.string "languages"
t.string "needs"
t.string "space"
t.string "theme"
t.text "host_info"
end end
end end

Loading…
Cancel
Save