diff --git a/app/views/users/_form.html.haml b/app/views/users/_form.html.haml
index adbe4326..099f3d59 100644
--- a/app/views/users/_form.html.haml
+++ b/app/views/users/_form.html.haml
@@ -3,8 +3,8 @@
- unless @user.new_record?
.form-field
- = f.label :name
- = f.text_field :name, :disabled => true
+ = f.label :account
+ = f.text_field :account, :disabled => true
.form-field
= f.label :email
@@ -48,7 +48,7 @@
.form-field
= f.label :notify_on_trade
= f.check_box :notify_on_trade, :class => "checkbox"
- .explanation= t(".notify_on_trade_explanation")
+ .explanation= t(".notify_on_trade_explanation")
%fieldset
%legend= t(".api_tools")
diff --git a/config/application.rb b/config/application.rb
index 307af3a8..58dd8d16 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -10,17 +10,13 @@
module BitcoinBank
class Application < Rails::Application
- I18n.const_set :Locales, {
- :en => "English",
- :fr => "Français"
- }
-
- config.i18n.default_locale = :en
-
- config.i18n.available_locales = I18n::Locales.keys
-
- config.i18n.load_path += Dir[Rails.root.join('config', 'locales', '**', '*.yml')]
+ # I18n.const_set :Locales, {
+ # :en => "English"
+ # }
+ config.time_zone = 'Beijing'
+ config.i18n.default_locale = 'en'
+ config.i18n.load_path += Dir[Rails.root.join('config', 'locales', '**', '*.{rb,yml}').to_s]
config.encoding = "utf-8"
config.filter_parameters += [:password]
@@ -32,7 +28,7 @@ class Application < Rails::Application
config.assets.enabled = true
config.assets.version = '1.0'
-
+
Haml::Template.options[:ugly] = true
end
end
diff --git a/config/database.yml b/config/database.yml
index 18f2e209..b32a9e1e 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -2,8 +2,8 @@ development:
adapter: mysql2
encoding: utf8
database: bitcoin-bank_development
- username: rails
- password: rails
+ username: root
+ password:
test:
adapter: mysql2
diff --git a/config/database.yml.example b/config/database.yml.example
new file mode 100644
index 00000000..5ed06c58
--- /dev/null
+++ b/config/database.yml.example
@@ -0,0 +1,13 @@
+development:
+ adapter: mysql2
+ encoding: utf8
+ database: bitcoin-bank_development
+ username: root
+ password:
+
+test:
+ adapter: mysql2
+ encoding: utf8
+ database: bitcoin-bank_test
+ username: root
+ password:
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index 3290371c..21a683d9 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -1,9 +1,10 @@
-# Use this hook to configure devise mailer, warden hooks and so forth. The first
-# four configuration values can also be set straight in your models.
+# Use this hook to configure devise mailer, warden hooks and so forth.
+# Many of these configuration options can be set straight in your model.
Devise.setup do |config|
# ==> Mailer Configuration
- # Configure the e-mail address which will be shown in DeviseMailer.
- config.mailer_sender = "Bitcoin Central support "
+ # Configure the e-mail address which will be shown in Devise::Mailer,
+ # note that it will be overwritten if you use your own mailer class with default "from" parameter.
+ config.mailer_sender = "please-change-me-at-config-initializers-devise@example.com"
# Configure the class responsible to send e-mails.
# config.mailer = "Devise::Mailer"
@@ -15,138 +16,237 @@
require 'devise/orm/active_record'
# ==> Configuration for any authentication mechanism
- # Configure which keys are used when authenticating an user. By default is
+ # Configure which keys are used when authenticating a user. The default is
# just :email. You can configure it to use [:username, :subdomain], so for
- # authenticating an user, both parameters are required. Remember that those
+ # authenticating a user, both parameters are required. Remember that those
# parameters are used only when authenticating and not when retrieving from
# session. If you need permissions, you should implement that in a before filter.
- config.authentication_keys = [ :name ]
+ # You can also supply a hash where the value is a boolean determining whether
+ # or not authentication should be aborted when the value is not present.
+ # config.authentication_keys = [ :email ]
+
+ # Configure parameters from the request object used for authentication. Each entry
+ # given should be a request method and it will automatically be passed to the
+ # find_for_authentication method and considered in your model lookup. For instance,
+ # if you set :request_keys to [:subdomain], :subdomain will be used on authentication.
+ # The same considerations mentioned for authentication_keys also apply to request_keys.
+ # config.request_keys = []
+
+ # Configure which authentication keys should be case-insensitive.
+ # These keys will be downcased upon creating or modifying a user and when used
+ # to authenticate or find a user. Default is :email.
+ config.case_insensitive_keys = [ :email ]
+
+ # Configure which authentication keys should have whitespace stripped.
+ # These keys will have whitespace before and after removed upon creating or
+ # modifying a user and when used to authenticate or find a user. Default is :email.
+ config.strip_whitespace_keys = [ :email ]
# Tell if authentication through request.params is enabled. True by default.
+ # It can be set to an array that will enable params authentication only for the
+ # given strategies, for example, `config.params_authenticatable = [:database]` will
+ # enable it only for database (email + password) authentication.
# config.params_authenticatable = true
- # Tell if authentication through HTTP Basic Auth is enabled. True by default.
- config.http_authenticatable = true
-
- # Set this to true to use Basic Auth for AJAX requests. True by default.
- config.http_authenticatable_on_xhr = true
-
- # The realm used in Http Basic Authentication
- config.http_authentication_realm = "Bitcoin Central"
+ # Tell if authentication through HTTP Auth is enabled. False by default.
+ # It can be set to an array that will enable http authentication only for the
+ # given strategies, for example, `config.http_authenticatable = [:token]` will
+ # enable it only for token authentication. The supported strategies are:
+ # :database = Support basic authentication with authentication key + password
+ # :token = Support basic authentication with token authentication key
+ # :token_options = Support token authentication with options as defined in
+ # http://api.rubyonrails.org/classes/ActionController/HttpAuthentication/Token.html
+ # config.http_authenticatable = false
+
+ # If http headers should be returned for AJAX requests. True by default.
+ # config.http_authenticatable_on_xhr = true
+
+ # The realm used in Http Basic Authentication. "Application" by default.
+ # config.http_authentication_realm = "Application"
+
+ # It will change confirmation, password recovery and other workflows
+ # to behave the same regardless if the e-mail provided was right or wrong.
+ # Does not affect registerable.
+ # config.paranoid = true
+
+ # By default Devise will store the user in session. You can skip storage for
+ # :http_auth and :token_auth by adding those symbols to the array below.
+ # Notice that if you are skipping storage for all authentication paths, you
+ # may want to disable generating routes to Devise's sessions controller by
+ # passing :skip => :sessions to `devise_for` in your config/routes.rb
+ config.skip_session_storage = [:http_auth]
+
+ # By default, Devise cleans up the CSRF token on authentication to
+ # avoid CSRF token fixation attacks. This means that, when using AJAX
+ # requests for sign in and sign up, you need to get a new CSRF token
+ # from the server. You can disable this option at your own risk.
+ # config.clean_up_csrf_token_on_authentication = true
# ==> Configuration for :database_authenticatable
# For bcrypt, this is the cost for hashing the password and defaults to 10. If
# using other encryptors, it sets how many times you want the password re-encrypted.
- config.stretches = 10
-
- # Define which will be the encryption algorithm. Devise also supports encryptors
- # from others authentication tools as :clearance_sha1, :authlogic_sha512 (then
- # you should set stretches above to 20 for default behavior) and :restful_authentication_sha1
- # (then you should set stretches to 10, and copy REST_AUTH_SITE_KEY to pepper)
- config.encryptor = :bcrypt
+ #
+ # Limiting the stretches to just one in testing will increase the performance of
+ # your test suite dramatically. However, it is STRONGLY RECOMMENDED to not use
+ # a value less than 10 in other environments.
+ config.stretches = Rails.env.test? ? 1 : 10
# Setup a pepper to generate the encrypted password.
- config.pepper = "91ad1e1ce0cabde16074553f385b11635b09fb44495d546e75a025bb9671f2715f4642e21d4dcf5c10e9077d81fb14833f1a8d29a9aaaea831c348d7f9837aa5"
+ # config.pepper = "894151605e3d8be8e272c6524967a9b9ae063b8bf2fd19dd3f8886c9169e96b79665ce7dee1712b13df60adec0cb989aa50771a8ffb5ca1799f08c95725f4684"
# ==> Configuration for :confirmable
- # The time you want to give your user to confirm his account. During this time
- # he will be able to access your application without confirming. Default is nil.
- # When confirm_within is zero, the user won't be able to sign in without confirming.
- # You can use this to let your user access some features of your application
- # without confirming the account, but blocking it after a certain period
- # (ie 2 days).
- config.confirm_within = 0
+ # A period that the user is allowed to access the website even without
+ # confirming his account. For instance, if set to 2.days, the user will be
+ # able to access the website for two days without confirming his account,
+ # access will be blocked just in the third day. Default is 0.days, meaning
+ # the user cannot access the website without confirming his account.
+ # config.allow_unconfirmed_access_for = 2.days
+
+ # A period that the user is allowed to confirm their account before their
+ # token becomes invalid. For example, if set to 3.days, the user can confirm
+ # their account within 3 days after the mail was sent, but on the fourth day
+ # their account can't be confirmed with the token any more.
+ # Default is nil, meaning there is no restriction on how long a user can take
+ # before confirming their account.
+ # config.confirm_within = 3.days
+
+ # If true, requires any email changes to be confirmed (exactly the same way as
+ # initial account confirmation) to be applied. Requires additional unconfirmed_email
+ # db field (see migrations). Until confirmed new email is stored in
+ # unconfirmed email column, and copied to email column on successful confirmation.
+ config.reconfirmable = true
+
+ # Defines which key will be used when confirming an account
+ # config.confirmation_keys = [ :email ]
# ==> Configuration for :rememberable
# The time the user will be remembered without asking for credentials again.
- # config.remember_for = 2.days
-
- # If true, a valid remember token can be re-used between multiple browsers.
- config.remember_across_browsers = true
+ # config.remember_for = 2.weeks
# If true, extends the user's remember period when remembered via cookie.
# config.extend_remember_period = false
+ # Options to be passed to the created cookie. For instance, you can set
+ # :secure => true in order to force SSL only cookies.
+ # config.rememberable_options = {}
+
# ==> Configuration for :validatable
- # Range for password length
- config.password_length = 6..100
+ # Range for password length. Default is 8..128.
+ config.password_length = 8..128
- # Regex to use to validate the email address
- config.email_regexp = /^([\w\.%\+\-]+)@([\w\-]+\.)+([\w]{2,})$/i
+ # Email regex used to validate email formats. It simply asserts that
+ # one (and only one) @ exists in the given string. This is mainly
+ # to give user feedback and not to assert the e-mail validity.
+ # config.email_regexp = /\A[^@]+@[^@]+\z/
# ==> Configuration for :timeoutable
# The time you want to timeout the user session without activity. After this
- # time the user will be asked for credentials again.
- config.timeout_in = 30.minutes
+ # time the user will be asked for credentials again. Default is 30 minutes.
+ # config.timeout_in = 30.minutes
+
+ # If true, expires auth token on session timeout.
+ # config.expire_auth_token_on_timeout = false
# ==> Configuration for :lockable
# Defines which strategy will be used to lock an account.
# :failed_attempts = Locks an account after a number of failed attempts to sign in.
# :none = No lock strategy. You should handle locking by yourself.
- config.lock_strategy = :failed_attempts
+ # config.lock_strategy = :failed_attempts
+
+ # Defines which key will be used when locking and unlocking an account
+ # config.unlock_keys = [ :email ]
# Defines which strategy will be used to unlock an account.
# :email = Sends an unlock link to the user email
# :time = Re-enables login after a certain amount of time (see :unlock_in below)
# :both = Enables both strategies
# :none = No unlock strategy. You should handle unlocking by yourself.
- config.unlock_strategy = :both
+ # config.unlock_strategy = :both
# Number of authentication tries before locking an account if lock_strategy
# is failed attempts.
- config.maximum_attempts = 3
+ # config.maximum_attempts = 20
# Time interval to unlock the account if :time is enabled as unlock_strategy.
- config.unlock_in = 24.hours
+ # config.unlock_in = 1.hour
+
+ # ==> Configuration for :recoverable
+ #
+ # Defines which key will be used when recovering the password for an account
+ # config.reset_password_keys = [ :email ]
+
+ # Time interval you can reset your password with a reset password key.
+ # Don't put a too small interval or your users won't have the time to
+ # change their passwords.
+ config.reset_password_within = 6.hours
+
+ # ==> Configuration for :encryptable
+ # Allow you to use another encryption algorithm besides bcrypt (default). You can use
+ # :sha1, :sha512 or encryptors from others authentication tools as :clearance_sha1,
+ # :authlogic_sha512 (then you should set stretches above to 20 for default behavior)
+ # and :restful_authentication_sha1 (then you should set stretches to 10, and copy
+ # REST_AUTH_SITE_KEY to pepper).
+ #
+ # Require the `devise-encryptable` gem when using anything other than bcrypt
+ # config.encryptor = :sha512
# ==> Configuration for :token_authenticatable
# Defines name of the authentication token params key
- config.token_authentication_key = :auth_token
+ # config.token_authentication_key = :auth_token
# ==> Scopes configuration
# Turn scoped views on. Before rendering "sessions/new", it will first check for
# "users/sessions/new". It's turned off by default because it's slower if you
# are using only default views.
- # config.scoped_views = true
+ # config.scoped_views = false
# Configure the default scope given to Warden. By default it's the first
- # devise role declared in your routes.
+ # devise role declared in your routes (usually :user).
# config.default_scope = :user
- # Configure sign_out behavior.
- # By default sign_out is scoped (i.e. /users/sign_out affects only :user scope).
- # In case of sign_out_all_scopes set to true any logout action will sign out all active scopes.
- # config.sign_out_all_scopes = false
+ # Set this configuration to false if you want /users/sign_out to sign out
+ # only the current scope. By default, Devise signs out all scopes.
+ # config.sign_out_all_scopes = true
# ==> Navigation configuration
# Lists the formats that should be treated as navigational. Formats like
# :html, should redirect to the sign in page when the user does not have
# access, but formats like :xml or :json, should return 401.
+ #
# If you have any extra navigational formats, like :iphone or :mobile, you
- # should add them to the navigational formats lists. Default is [:html]
- # config.navigational_formats = [:html, :iphone]
+ # should add them to the navigational formats lists.
+ #
+ # The "*/*" below is required to match Internet Explorer requests.
+ # config.navigational_formats = ["*/*", :html]
+
+ # The default HTTP method used to sign out a resource. Default is :delete.
+ config.sign_out_via = :delete
+
+ # ==> OmniAuth
+ # Add a new OmniAuth provider. Check the wiki for more information on setting
+ # up on your models and hooks.
+ # config.omniauth :github, 'APP_ID', 'APP_SECRET', :scope => 'user,public_repo'
# ==> Warden configuration
- # If you want to use other strategies, that are not (yet) supported by Devise,
- # you can configure them inside the config.warden block. The example below
- # allows you to setup OAuth, using http://github.com/roman/warden_oauth
+ # If you want to use other strategies, that are not supported by Devise, or
+ # change the failure app, you can configure them inside the config.warden block.
#
# config.warden do |manager|
- # manager.oauth(:twitter) do |twitter|
- # twitter.consumer_secret =
- # twitter.consumer_key =
- # twitter.options :site => 'http://twitter.com'
- # end
- # manager.default_strategies(:scope => :user).unshift :twitter_oauth
+ # manager.intercept_401 = false
+ # manager.default_strategies(:scope => :user).unshift :some_external_strategy
# end
- config.paranoid = true
-
- require 'devise/strategies/ga_otp_authenticatable'
- require 'devise/strategies/yk_otp_authenticatable'
-
- config.warden do |manager|
- manager.default_strategies(:scope => :user).unshift :ga_otp_authenticatable
- manager.default_strategies(:scope => :user).unshift :yk_otp_authenticatable
- end
+ # ==> Mountable engine configurations
+ # When using Devise inside an engine, let's call it `MyEngine`, and this engine
+ # is mountable, there are some extra configurations to be taken into account.
+ # The following options are available, assuming the engine is mounted as:
+ #
+ # mount MyEngine, at: "/my_engine"
+ #
+ # The router that invoked `devise_for`, in the example above, would be:
+ # config.router_name = :my_engine
+ #
+ # When using omniauth, Devise cannot automatically set Omniauth path,
+ # so you need to do it manually. For the users scope, it would be:
+ # config.omniauth_path_prefix = "/my_engine/users/auth"
end
diff --git a/config/locales/en/other.yml b/config/locales/en/other.yml
index cd979dd9..93c203ac 100644
--- a/config/locales/en/other.yml
+++ b/config/locales/en/other.yml
@@ -14,7 +14,7 @@ en:
no_data: No data has been found
# controllers/informations_controller.rb
- chart_date_format: %m/%d
+ chart_date_format: "%m/%d"
# controllers/sessions_controller.rb
sign_in_success: You logged-in successfully to your account.
@@ -50,7 +50,7 @@ en:
# helpers/transfers_helper.rb
confirmations_left:
one: 1 confirmation left
- other: %{count} confirmations left
+ other: "%{count} confirmations left"
# mailers/backup_mailer.rb
support_from: Bitcoin Central support <%{support_email}>
@@ -108,7 +108,7 @@ en:
sign_in_submit: Sign-in
# views/trade_orders/book.html
- order_book_title: Select a currency
+ order_book_title: Select a currency
amount: Amount
price: Price
no_buying_orders_found: No buying orders have been found.
@@ -116,7 +116,7 @@ en:
# views/trades/index.html
trade_history_title: Trade history
- no_trades_found: No trades were found
+ no_trades_found: No trades were found
# views/transfers/index.html
account_history_title: Account history
diff --git a/config/locales/en/views.yml b/config/locales/en/views.yml
index cc330e2e..9372ee13 100644
--- a/config/locales/en/views.yml
+++ b/config/locales/en/views.yml
@@ -1,278 +1,277 @@
-en:
- layouts:
- application:
- title: "Bitcoin-Central : Trade Bitcoins easily and safely"
- description: Buy, sell and store Bitcoins easily and safely on the best open-source platform
- user_informations:
- signed_in_as: Signed-in as
- address_tip: A new address is generated each time you receive a payment, your previous addresses will still work though
- your_address: Your address
- logout: Logout
- sign_up: Sign-up
- sign_in: Sign-in
- navigation:
- account:
- main: Account
- balance: Balance
- history: History
- withdraw: Withdraw
- deposit: Deposit
- trading:
- main: Trading
- your_orders: Trade orders
- order_book: Order book
- trade_history: Trade history
- admin:
- main: Admin
- transfers: Transfers
- users: Users
- information: Informations
- pending_transfers: Pending transfers
- help:
- main: Help
- faq: FAQ
- economy: Economy
- support: Support
- fees: Our Fees
- api_docs: API
- terms_of_service: Terms of Service
- ecommerce:
- main: E-commerce
-
- invoices:
- new:
- create_invoice: Create an invoice
- error: Error posting invoice
- amount_explanation: The amount to be paid for this invoice
- payment_explanation: The address at which the funds should be sent
- callback_url_explanation: The URL that should be POST'ed to upon payment
- submit: Post invoice
- created: Invoice successfully posted
- item_url_explanation: Related order URL on the merchant website
- index:
- details: Show invoice details
- create: Create invoice
- deleted: Invoice deleted successfully
- confirm: Are you sure you want to delete this invoice ?
- delete: Delete this invoice
- show:
- details: Invoice details
- payee: Payee
- payment-explanations: >
- To pay this invoice, simply transfer the requested amount to
- the payment address, the page will automatically refresh to
- show you its progress.
- return_to_item: Return to merchant website
-
- trade_orders:
- index:
- create: Create an order
- active_orders: "Active orders (%{count})"
- inactive_orders: "Inactive orders (%{count})"
- detailed_list:
- na: N/A
- sell: Ask
- buy: Bid
- market: Market
- limit: Limit
- delete_order: Delete this trade order
- delete_order_confirm: Are you sure you want to delete this trade order ?
- activate_order: Activate this trade order and execute it
- activate_order_confirm: Are you sure you want to activate this trade order ?
- book:
- bids: Bids
- asks: Asks
- list:
- price: Price
- amount: Amount
- total: Total
- market_order: Market Order
- new:
- title: Create a trade order
- currency_explanation: Currency you want to trade
- type_explanation: Different matching types are explained in our help page
- category: Category
- buy: Buy
- sell: Sell
- sell_or_buy_explanation: Whether you want to buy or sell bitcoins
- your_balance: Your balance
- your_balance_explanation: Your available confirmed balance
- amount_explanation: BTC amount you're trading
- ppc_explanation: Price for 1 BTC
- total_explanation: The total for your order
- dark_pool_explanation: Should the order be hidden ?
- help: Visit our help page if you need assistance trading Bitcoins
- error:
- one: "1 error prevented your trade order from being created :"
- other: "%{count} errors prevented your trade order from being created :"
-
- trades:
- index:
- title: Trade history
-
- accounts:
- show:
- add_funds: Deposit funds
- deposit:
- not_available: SEPA wire deposits are currently unavailable
- deposit_bitcoins_title: Deposit Bitcoins
- deposit_bitcoins_body_html:
-
Simply transfer funds to your address and they'll show up in your account after a couple of minutes. Your address is located in the upper right corner of the screen.
- You will be able to use these funds after the transaction is confirmed (approximately %{estimation} minutes).
- deposit_eur_title: Deposit with bank wire
- deposit_eur_body_html: "
-
- Funding your EUR account with a SEPA wire is free.
-
-
You must include your account ID in the \"Comments\" field
-
You can wire most currencies, it will get converted to EUR before funding your account
-
Fees may apply for non-SEPA transfers, contact us for more details
- Use this form to specify the amount of gold grams to deposit, upon submission
- you'll be taken to the Pecunix interface to confirm the transfer. Once the transfer
- is completed, the gold will appear in your balance.
-
- pgau_amount: Amount (PGAU)
- deposit_pgau: Deposit Pecunix
- other_options: Other options
- add_bank_account: Add a bank account
- lr_sci_form:
- click_for_lr_html: Click here to pay with your Liberty Reserve account (LREUR and LRUSD).
-
- users:
- form:
- submit: Submit
- merchant_explanation: Activate merchant tools
- ga_otp_explanation: Require Google Auth. OTP
- ga_otp_config: Help and setup instructions
- additional_authentication_requirements: Additional authentication requirements
- api_tools: API & Tools
- yk_otp_config: Associate keys to your account
- time_zone_explanation: Used to display localized dates and times
- manage_bank_accounts: Manage your bank accounts
- registered_bank_accounts:
- zero: You haven't registered any bank account yet.
- one: You have registered a bank account
- other: You have registered %{count} bank accounts
- notifications: E-mail notifications
- notify_on_trade_explanation: Receive a notification when one of your trade orders gets matched
- ga_otp_configuration:
- reset: The Google Authenticator shared-secret has been correctly reset, you should update your mobile device settings
- password_change_form:
- change_password: Change your password
- submit: Submit
- password_updated: Your password has been updated successfully
-
-
- yubikeys:
- index:
- create: Associate a Yubikey to your account
- delete: Delete this Yubikey
- confirm: Are you sure ?
- associate: Associate a new Yubikey
- otp_explanation: Simply generate an OTP here to associate your key
- created: Yubikey associated, you'll need it for your next sign-in
- destroyed: Yubikey removed
- error: This key could not be associated to your account
-
- devise:
- sessions:
- new:
- ga_otp_explanation: Required only if you enabled Google Authenticator
- yk_otp_explanation: Required only if you enabled a Yubikey
- password_explanation: Password forgotten ?
- sign_in: Sign-in
-
- unlocks:
- new:
- resend: Send unlock instructions
-
- transfers:
- index:
- details: Transaction details
- successful:
- processed: Your successfully withdrew %{amount} %{currency}
- pending: Your withdrawal request was successful and will be processed shortly
- show:
- state:
- processed: Processed
- pending: Pending
- new:
- title: Withdraw funds
- body_html: "
-
You can currently withdraw using the following methods :
-
-
Bitcoins,
-
EUR bank wire,
-
Liberty Reserve automated transfer,
-
Pecunix manual transfer
-
-
- "
- error: "Some errors prevent your funds from being withdrawn :"
- max_amount: Maximum amount
- submit: Transfer
- manage_bank_accounts: Manage your bank accounts
-
- bank_accounts:
- index:
- title: Add a bank account
- submit: Submit
- created: Bank account successfully registered
- error: Your bank account could not be registered
- destroyed: Bank account deleted
- not_destroyed: You cannot delete a bank account that has been verified or wired to
- list:
- delete: Delete
- confirm: Are you sure you want to delete this bank account?
-
- static_pages:
- show:
- last_modification_at: "This page was last updated at %{updated_at}"
-
- tickets:
- new:
- title: Open a support request
- submit: Submit request
- description_explanation: Please be as accurate as possible when describing your request and provide all the relevant details.
- error: Unable to submit your support request
- index:
- successfully_created: Your request was saved successfully, it will be processed as soon as possible
- your_tickets: Your support requests
- no_tickets_found: You have no support requests to display
- ticket:
- add_comment: Add a comment
- someone_wrote: %{who} wrote, %{when} ago
- you: You
- reopen : Re-open ticket
- close: Close ticket
-
- informations:
- welcome:
- download: Download Bitcoin 0.5.0
- source: Source code
- trading_data_title: Last week's trading data
- welcome: Welcome to bitcoin-central.net!
-
- support:
- contact: Contact us
- contact_description_html: "You can reach us at %{email}"
- please_sign_in: Please sign-in to open a support request
- your_tickets:
- zero: You don't have any pending support tickets.
- one: You have a pending support ticket.
- other: You have %{count} pending support tickets.
- open_a_ticket: Open a new support ticket
- view_tickets: View all requests
+en:
+ layouts:
+ application:
+ title: "Bitcoin-Central : Trade Bitcoins easily and safely"
+ description: "Buy, sell and store Bitcoins easily and safely on the best open-source platform"
+ user_informations:
+ signed_in_as: "Signed-in as"
+ address_tip: "A new address is generated each time you receive a payment, your previous addresses will still work though"
+ your_address: "Your address"
+ logout: "Logout"
+ sign_up: "Sign-up"
+ sign_in: "Sign-in"
+ navigation:
+ account:
+ main: "Account"
+ balance: "Balance"
+ history: "History"
+ withdraw: "Withdraw"
+ deposit: "Deposit"
+ trading:
+ main: "Trading"
+ your_orders: "Trade orders"
+ order_book: "Order book"
+ trade_history: "Trade history"
+ admin:
+ main: "Admin"
+ transfers: "Transfers"
+ users: "Users"
+ information: "Informations"
+ pending_transfers: "Pending transfers"
+ help:
+ main: "Help"
+ faq: "FAQ"
+ economy: "Economy"
+ support: "Support"
+ fees: "Our Fees"
+ api_docs: "API"
+ terms_of_service: "Terms of Service"
+ ecommerce:
+ main: "E-commerce"
+
+ invoices:
+ new:
+ create_invoice: "Create an invoice"
+ error: "Error posting invoice"
+ amount_explanation: "The amount to be paid for this invoice"
+ payment_explanation: "The address at which the funds should be sent"
+ callback_url_explanation: "The URL that should be POST'ed to upon payment"
+ submit: "Post invoice"
+ created: "Invoice successfully posted"
+ item_url_explanation: "Related order URL on the merchant website"
+ index:
+ details: "Show invoice details"
+ create: "Create invoice"
+ deleted: "Invoice deleted successfully"
+ confirm: "Are you sure you want to delete this invoice ?"
+ delete: "Delete this invoice"
+ show:
+ details: "Invoice details"
+ payee: "Payee"
+ payment-explanations: >
+ To pay this invoice, simply transfer the requested amount to
+ the payment address, the page will automatically refresh to
+ show you its progress.
+ return_to_item: Return to merchant website
+ trade_orders:
+ index:
+ create: "Create an order"
+ active_orders: "Active orders (%{count})"
+ inactive_orders: "Inactive orders (%{count})"
+ detailed_list:
+ na: "N/A"
+ sell: "Ask"
+ buy: "Bid"
+ market: "Market"
+ limit: "Limit"
+ delete_order: "Delete this trade order"
+ delete_order_confirm: "Are you sure you want to delete this trade order ?"
+ activate_order: "Activate this trade order and execute it"
+ activate_order_confirm: "Are you sure you want to activate this trade order ?"
+ book:
+ bids: "Bids"
+ asks: "Asks"
+ list:
+ price: "Price"
+ amount: "Amount"
+ total: "Total"
+ market_order: "Market Order"
+ new:
+ title: "Create a trade order"
+ currency_explanation: "Currency you want to trade"
+ type_explanation: "Different matching types are explained in our help page"
+ category: "Category"
+ buy: "Buy"
+ sell: "Sell"
+ sell_or_buy_explanation: "Whether you want to buy or sell bitcoins"
+ your_balance: "Your balance"
+ your_balance_explanation: "Your available confirmed balance"
+ amount_explanation: "BTC amount you're trading"
+ ppc_explanation: "Price for 1 BTC"
+ total_explanation: "The total for your order"
+ dark_pool_explanation: "Should the order be hidden ?"
+ help: "Visit our help page if you need assistance trading Bitcoins"
+ error:
+ one: "1 error prevented your trade order from being created :"
+ other: "%{count} errors prevented your trade order from being created :"
+
+ trades:
+ index:
+ title: "Trade history"
+
+ accounts:
+ show:
+ add_funds: "Deposit funds"
+ deposit:
+ not_available: "SEPA wire deposits are currently unavailable"
+ deposit_bitcoins_title: "Deposit Bitcoins"
+ deposit_bitcoins_body_html:
+
Simply transfer funds to your address and they'll show up in your account after a couple of minutes. Your address is located in the upper right corner of the screen.
+ You will be able to use these funds after the transaction is confirmed (approximately %{estimation} minutes).
+
+ deposit_eur_title: Deposit with bank wire
+ deposit_eur_body_html:
+
+ Funding your EUR account with a SEPA wire is free.
+
+
You must include your account ID in the \"Comments\" field
+
You can wire most currencies, it will get converted to EUR before funding your account
+
Fees may apply for non-SEPA transfers, contact us for more details
+ Use this form to specify the amount of gold grams to deposit, upon submission
+ you'll be taken to the Pecunix interface to confirm the transfer. Once the transfer
+ is completed, the gold will appear in your balance.
+
+ pgau_amount: "Amount (PGAU)"
+ deposit_pgau: "Deposit Pecunix"
+ other_options: "Other options"
+ add_bank_account: "Add a bank account"
+ lr_sci_form:
+ click_for_lr_html: 'Click here to pay with your Liberty Reserve account (LREUR and LRUSD).'
+
+ users:
+ form:
+ submit: "Submit"
+ merchant_explanation: "Activate merchant tools"
+ ga_otp_explanation: "Require Google Auth. OTP"
+ ga_otp_config: "Help and setup instructions"
+ additional_authentication_requirements: "Additional authentication requirements"
+ api_tools: "API & Tools"
+ yk_otp_config: "Associate keys to your account"
+ time_zone_explanation: "Used to display localized dates and times"
+ manage_bank_accounts: "Manage your bank accounts"
+ registered_bank_accounts:
+ zero: "You haven't registered any bank account yet."
+ one: "You have registered a bank account"
+ other: "You have registered %{count} bank accounts"
+ notifications: "E-mail notifications"
+ notify_on_trade_explanation: "Receive a notification when one of your trade orders gets matched"
+ ga_otp_configuration:
+ reset: "The Google Authenticator shared-secret has been correctly reset, you should update your mobile device settings"
+ password_change_form:
+ change_password: "Change your password"
+ submit: "Submit"
+ password_updated: "Your password has been updated successfully"
+
+
+ yubikeys:
+ index:
+ create: Associate a Yubikey to your account
+ delete: Delete this Yubikey
+ confirm: Are you sure ?
+ associate: Associate a new Yubikey
+ otp_explanation: Simply generate an OTP here to associate your key
+ created: "Yubikey associated, you'll need it for your next sign-in"
+ destroyed: Yubikey removed
+ error: This key could not be associated to your account
+
+ devise:
+ sessions:
+ new:
+ ga_otp_explanation: Required only if you enabled Google Authenticator
+ yk_otp_explanation: Required only if you enabled a Yubikey
+ password_explanation: Password forgotten ?
+ sign_in: Sign-in
+
+ unlocks:
+ new:
+ resend: Send unlock instructions
+
+ transfers:
+ index:
+ details: Transaction details
+ successful:
+ processed: Your successfully withdrew %{amount} %{currency}
+ pending: Your withdrawal request was successful and will be processed shortly
+ show:
+ state:
+ processed: Processed
+ pending: Pending
+ new:
+ title: Withdraw funds
+ body_html: >
+
You can currently withdraw using the following methods :
+
+
Bitcoins,
+
EUR bank wire,
+
Liberty Reserve automated transfer,
+
Pecunix manual transfer
+
+
+
+ error: "Some errors prevent your funds from being withdrawn :"
+ max_amount: Maximum amount
+ submit: Transfer
+ manage_bank_accounts: Manage your bank accounts
+
+ bank_accounts:
+ index:
+ title: Add a bank account
+ submit: Submit
+ created: Bank account successfully registered
+ error: Your bank account could not be registered
+ destroyed: Bank account deleted
+ not_destroyed: You cannot delete a bank account that has been verified or wired to
+ list:
+ delete: Delete
+ confirm: Are you sure you want to delete this bank account?
+
+ static_pages:
+ show:
+ last_modification_at: "This page was last updated at %{updated_at}"
+
+ tickets:
+ new:
+ title: Open a support request
+ submit: Submit request
+ description_explanation: Please be as accurate as possible when describing your request and provide all the relevant details.
+ error: Unable to submit your support request
+ index:
+ successfully_created: Your request was saved successfully, it will be processed as soon as possible
+ your_tickets: Your support requests
+ no_tickets_found: You have no support requests to display
+ ticket:
+ add_comment: Add a comment
+ someone_wrote: "%{who} wrote, %{when} ago"
+ you: You
+ reopen : Re-open ticket
+ close: Close ticket
+
+ informations:
+ welcome:
+ download: Download Bitcoin 0.5.0
+ source: Source code
+ trading_data_title: Last week's trading data
+ welcome: Welcome to bitcoin-central.net!
+
+ support:
+ contact: Contact us
+ contact_description_html: "You can reach us at %{email}"
+ please_sign_in: Please sign-in to open a support request
+ your_tickets:
+ zero: You don't have any pending support tickets.
+ one: You have a pending support ticket.
+ other: You have %{count} pending support tickets.
+ open_a_ticket: Open a new support ticket
+ view_tickets: View all requests
diff --git a/config/locales/fr/currencies.yml b/config/locales/fr/currencies.yml
deleted file mode 100644
index 7c7fa4fb..00000000
--- a/config/locales/fr/currencies.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-fr:
- currencies:
- all:
- name: Toutes devises
- btc:
- name: Bitcoin
- link: http://www.bitcoin.org/
- eur:
- name: Euro
- link: http://www.ecb.int/
- lrusd:
- name: Dollar Liberty Reserve
- link: https://www.libertyreserve.com/?ref=U8651415
- lreur:
- name: Euro Liberty Reserve
- link: https://www.libertyreserve.com/?ref=U8651415
- pgau:
- name: Or Pecunix
- link: http://www.pecunix.com/
- cad:
- name: Dollar Canadien
- link: http://www.bankofcanada.ca/
- inr:
- name: Roupie Indienne
- link: http://www.rbi.org.in/
- usd:
- name: Dollar US
- link: http://www.federalreserve.gov/
diff --git a/config/locales/fr/defaults.yml b/config/locales/fr/defaults.yml
deleted file mode 100644
index 02ffbbc3..00000000
--- a/config/locales/fr/defaults.yml
+++ /dev/null
@@ -1,193 +0,0 @@
-# French translations for Ruby on Rails
-# by Christian Lescuyer (christian@flyingcoders.com)
-# contributors:
-# - Sebastien Grosjean - ZenCocoon.com
-# - Bruno Michel - http://github.com/nono
-# - Tsutomu Kuroda - http://github.com/kuroda (t-kuroda@oiax.jp)
-
-fr:
- date:
- formats:
- default: "%d/%m/%Y"
- short: "%e %b"
- long: "%e %B %Y"
- day_names: [dimanche, lundi, mardi, mercredi, jeudi, vendredi, samedi]
- abbr_day_names: [dim, lun, mar, mer, jeu, ven, sam]
- month_names: [~, janvier, février, mars, avril, mai, juin, juillet, août, septembre, octobre, novembre, décembre]
- abbr_month_names: [~, jan., fév., mar., avr., mai, juin, juil., août, sept., oct., nov., déc.]
- order:
- - :day
- - :month
- - :year
-
- time:
- formats:
- default: "%d/%m/%Y %H:%M"
- short: "%d %b %H:%M"
- long: "%A %d %B %Y %H:%M"
- am: 'am'
- pm: 'pm'
-
- datetime:
- distance_in_words:
- half_a_minute: "une demi-minute"
- less_than_x_seconds:
- zero: "moins d'une seconde"
- one: "moins d'une seconde"
- other: "moins de %{count} secondes"
- x_seconds:
- one: "1 seconde"
- other: "%{count} secondes"
- less_than_x_minutes:
- zero: "moins d'une minute"
- one: "moins d'une minute"
- other: "moins de %{count} minutes"
- x_minutes:
- one: "1 minute"
- other: "%{count} minutes"
- about_x_hours:
- one: "environ une heure"
- other: "environ %{count} heures"
- x_days:
- one: "1 jour"
- other: "%{count} jours"
- about_x_months:
- one: "environ un mois"
- other: "environ %{count} mois"
- x_months:
- one: "1 mois"
- other: "%{count} mois"
- about_x_years:
- one: "environ un an"
- other: "environ %{count} ans"
- over_x_years:
- one: "plus d'un an"
- other: "plus de %{count} ans"
- almost_x_years:
- one: "presqu'un an"
- other: "presque %{count} ans"
- prompts:
- year: "Année"
- month: "Mois"
- day: "Jour"
- hour: "Heure"
- minute: "Minute"
- second: "Seconde"
-
- number:
- format:
- separator: ","
- delimiter: " "
- precision: 3
- significant: false
- strip_insignificant_zeros: false
- currency:
- format:
- format: "%n %u"
- unit: "€"
- separator: ","
- delimiter: " "
- precision: 2
- significant: false
- strip_insignificant_zeros: false
- percentage:
- format:
- delimiter: ""
- precision:
- format:
- delimiter: ""
- human:
- format:
- delimiter: ""
- precision: 2
- significant: true
- strip_insignificant_zeros: true
- storage_units:
- format: "%n %u"
- units:
- byte:
- one: "octet"
- other: "octets"
- kb: "ko"
- mb: "Mo"
- gb: "Go"
- tb: "To"
- decimal_units:
- format: "%n %u"
- units:
- unit: ""
- thousand: "millier"
- million: "million"
- billion: "milliard"
- trillion: "billion"
- quadrillion: "million de milliards"
-
- support:
- array:
- words_connector: ", "
- two_words_connector: " et "
- last_word_connector: " et "
- select:
- prompt: "Veuillez sélectionner"
-
- helpers:
- select:
- prompt: "Veuillez sélectionner"
- submit:
- create: "Créer un %{model}"
- update: "Modifier ce %{model}"
- submit: "Enregistrer ce %{model}"
-
- attributes:
- created_at: "Créé le"
- updated_at: "Modifié le"
-
- errors:
- format: "%{attribute} : %{message}"
- messages: &errors_messages
- inclusion: "n'est pas inclus(e) dans la liste"
- exclusion: "n'est pas disponible"
- invalid: "n'est pas valide"
- confirmation: "ne concorde pas avec la confirmation"
- accepted: "doit être accepté(e)"
- empty: "doit être rempli(e)"
- blank: "doit être rempli(e)"
- too_long: "est trop long (pas plus de %{count} caractères)"
- too_short: "est trop court (au moins %{count} caractères)"
- wrong_length: "ne fait pas la bonne longueur (doit comporter %{count} caractères)"
- not_a_number: "n'est pas un nombre"
- not_an_integer: "doit être un nombre entier"
- greater_than: "doit être supérieur à %{count}"
- greater_than_or_equal_to: "doit être supérieur ou égal à %{count}"
- equal_to: "doit être égal à %{count}"
- less_than: "doit être inférieur à %{count}"
- less_than_or_equal_to: "doit être inférieur ou égal à %{count}"
- odd: "doit être impair"
- even: "doit être pair"
- invalid_otp: Jeton d'authentification invalide
- debit_not_equal_to_credit: Le débit est différent du crédit pour la devise %{currency}
- should_be_negative: doit être négatif
- max_amount: ne peut pas être supérieur à votre limite (%{maximum} %{currency})
- unknown_country_code: a un code pays invalide
- bad_check_digits: a une clef de contrôle invalide
- bad_format: a un format incorrect
- bad_length: a une longueur incorrecte
- bad_chars: comprend des caractères invalides
- insufficient_privileges: Privilèges insuffisants
- should_be_blank: ne peut pas être renseigné
- template: &errors_template
- header:
- one: "Impossible d'enregistrer ce %{model} : 1 erreur"
- other: "Impossible d'enregistrer ce %{model} : %{count} erreurs"
- body: "Veuillez vérifier les champs suivants : "
-
- activerecord:
- errors:
- messages:
- taken: "n'est pas disponible"
- record_invalid: "La validation a échoué : %{errors}"
- <<: *errors_messages
- template:
- <<: *errors_template
- full_messages:
- format: "%{attribute} %{message}"
diff --git a/config/locales/fr/devise.yml b/config/locales/fr/devise.yml
deleted file mode 100644
index 9f4fb6c4..00000000
--- a/config/locales/fr/devise.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-fr:
- errors:
- messages:
- not_found: "not found"
- already_confirmed: "was already confirmed"
- not_locked: "was not locked"
-
- devise:
- failure:
- unauthenticated: 'Vous devez-être connecté pour accéder à cette page'
- unconfirmed: 'You have to confirm your account before continuing'
- locked: 'Your account is locked'
- invalid: 'Invalid email or password'
- invalid_token: 'Invalid authentication token'
- timeout: 'Your session expired, please sign in again to continue'
- inactive: 'Your account was not activated yet'
- invalid_ga_otp: Code Google Authenticator invalide ou expiré
- invalid_yk_otp: Code Yubikey invalide
- sessions:
- signed_in: 'Connexion réussie'
- signed_out: 'Déconnexion réussie'
- passwords:
- send_instructions: 'You will receive an email with instructions about how to reset your password in a few minutes'
- updated: 'Your password was changed successfully. You are now signed in'
- confirmations:
- send_instructions: 'You will receive an email with instructions about how to confirm your account in a few minutes'
- confirmed: 'Your account was successfully confirmed. You are now signed in'
- registrations:
- signed_up: 'You have registered successfully. Confirmation instructions have been sent to you by e-mail'
- updated: 'You updated your account successfully'
- destroyed: 'Bye! Your account was successfully cancelled. We hope to see you again soon'
- unlocks:
- send_instructions: 'You will receive an email with instructions about how to unlock your account in a few minutes'
- unlocked: 'Your account was successfully unlocked. You are now signed in'
- mailer:
- confirmation_instructions:
- subject: 'Confirmation instructions'
- reset_password_instructions:
- subject: 'Reset password instructions'
- unlock_instructions:
- subject: 'Unlock Instructions'
diff --git a/config/locales/fr/emails.yml b/config/locales/fr/emails.yml
deleted file mode 100644
index 691e8da5..00000000
--- a/config/locales/fr/emails.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-fr:
- emails:
- invoice_payment_notification:
- subject: Vous avez reçu un paiement bitcoin!
- body: "Vous avez reçu un paiement de %{amount} BTC en paiement de la facture %{reference}"
-
- withdrawal_processed_notification:
- subject: Votre demande de paiement a été traitée
- body: "Votre demande de paiement a été traitée, vous devriez recevoir un virement sous peu."
-
- tickets:
- view_details_of: "Voir les détails du ticket \"%{title}\""
- reopen_notification:
- subject: Votre ticket a été ré-ouvert
- create_notification:
- subject: Un nouveau ticket a été ouvert
- close_notification:
- subject: Votre ticket a été clôturé
- comment_notification:
- subject: Un commentaire a été ajouté sur votre ticket
-
- trade_notification:
- subject: Vos ordres d'échange ont été exécutés
- traded: "%{traded_btc} BTC au prix de %{ppc} %{currency} par BTC pour un total de %{traded_currency} %{currency}"
- bought: Achats
- sold: Ventes
-
diff --git a/config/locales/fr/models.yml b/config/locales/fr/models.yml
deleted file mode 100644
index 4c8eb0ba..00000000
--- a/config/locales/fr/models.yml
+++ /dev/null
@@ -1,198 +0,0 @@
-fr:
- activerecord:
- attributes:
- invoice:
- reference: Référence
- user: Emetteur
- payment_address: Adresse de paiement
- amount: Montant
- callback_url: URL de notification
- state: Etat
- paid_at: Payé le
- merchant_reference: Réf. bénéficiaire
- merchant_memo: Commentaire
- authentication_token: Jeton d'authentification
- item_url: URL de la commande
- liberty_reserve_transfer:
- lr_account_id: Compte Liberty Reserve
- trade_order:
- amount: Montant
- dark_pool: Ordre masqué
- ppc: Prix
- category: Type
- type: Matching
- currency: Devise
- total: Total
- created_at: Création
- updated_at: Mise à jour
- transfer:
- id: ID
- created_at: Date
- user: Utilisateur
- amount: Montant
- address: Adresse
- currency: Devise
- bt_tx_confirmations: Confirmations
- bt_tx_from: Adresse Bitcoin d'origine
- bt_tx_id: Transaction Bitcoin
- email: Adresse e-mail
- lr_merchant_fee: Commission Liberty Reserve
- lr_transferred_amount: Montant Liberty Reserve transféré
- lr_transaction_id: Réf. Liberty Reserve
- lr_account_id: Compte Liberty Reserve
- px_tx_id: Réf. Pecunix
- px_fee: Commission Pecunix
- px_payer: Expéditeur Pecunix
- state: État
- user:
- id: ID
- email: Adresse e-mail
- password: Mot de passe
- password_confirmation: Confirmation du mot de passe
- recaptcha_response_field: Etes vous un humain?
- name: Compte
- admin: Administration
- authentication_token: Jeton d'authentification
- confirmation_sent_at: Envoi du mail de confirmation
- confirmation_token: Jeton de confirmation
- confirmed_at: Confirmation
- current_sign_in_at: Connexion courante
- current_sign_in_ip: IP de connexion courante
- encrypted_password: Mot de passe crypté
- failed_attempts: Echecs d'authentification
- last_address: Dernière adresse Bitcoin
- last_sign_in_at: Dernière connexion
- last_sign_in_ip: IP de dernière connexion
- locked_at: Verouillé le
- password_salt: Sel de mot de passe
- remember_created_at: Rappel
- remeber_token: Jeton de rappel
- reset_password_token: Jeton de changement de mot de passe
- salt: Sel
- secret_token: Jeton secret
- time_zone: Fuseau horaire
- unlock_token: Jeton de déverouillage
- purchase_trades: Transactions d'achat
- sale_trades: Transactions de vente
- trade_orders: Ordres
- transfers: Transactions
- current_password: Mot de passe actuel
- new_password: Nouveau mot de passe
- merchant: API E-commerce
- require_ga_otp: Google Authenticator
- require_yk_otp: Yubikey
- ga_otp: Code Google Auth.
- yk_otp: Code Yubikey
- bank_account_id: Compte bancaire
- full_name: Votre nom
- address: Votre addresse
- notify_on_trade: Exécution d'ordre
- trade:
- type: Type
- amount: Montant
- price: Taux
- total: Total
- created_at: Date
- announcement:
- content: Message
- active: Activé
- yubikey:
- otp: Code Yubikey
- key_id: Identifiant de clé
- active: Activée
- created_at: Création
- static_pages:
- title: Titre
- locale: Locale
- contents: Contenu
- created_at: Date de création
- updated_at: Date de dernière mise à jour
- bank_account:
- bic: BIC
- iban: IBAN
- account_holder: Nom et adresse
- created_at: Enregistré le
- state: État
- currency:
- code: Code
- created_at: Création
- updated_at: Mise à jour
- ticket:
- id: Réf.
- title: Titre
- state: Statut
- description: Description
- created_at: Ouvert le
- updated_at: Mis à jour
-
- models:
- invoice:
- one: Facture
- other: Factures
- user:
- one: Utilisateur
- other: Utilisateurs
- trade_order:
- one: Ordre
- other: Ordres
- account_operation:
- one: Opération
- other: Opérations
- transfer:
- one: Transaction
- other: Transactions
- trade:
- one: Echange
- other: Echanges
- announcement:
- one: Annonce
- other: Annonces
- yubikey:
- one: Yubikey
- other: Yubikeys
- static_page:
- one: Page statique
- other: Pages statiques
- bank_account:
- one: Compte bancaire
- other: Comptes bancaires
- ticket:
- one: Ticket
- other: Tickets
- currency:
- one: Devise
- other: Devises
-
- extra:
- invoice:
- state_translations:
- pending: En attente de paiement
- processing: Traitement en cours
- paid: Payé
- state_tooltips:
- pending: Aucun paiement n'a encore été reçu
- processing: Un paiement a été reçu, il est en attente de confirmation par le réseau Bitcoin
- paid: Paiement a été confirmé
- trade:
- types:
- buy: Achat
- sell: Vente
- bank_account:
- states:
- unverified: Non vérifié
- verified: Vérifié
- currency:
- codes:
- eur: Euro
- usd: Dollar US
- cad: Dollar Canadien
- inr: Roupie Indienne
- lrusd: Dollar Liberty Reserve
- lreur: Euro Liberty Reserve
- pgau: Or Pecunix
- btc: Bitcoin
- ticket:
- states:
- pending: En cours
- solved: Résolu
- closed: Fermé
diff --git a/config/locales/fr/other.yml b/config/locales/fr/other.yml
deleted file mode 100644
index 75d40b68..00000000
--- a/config/locales/fr/other.yml
+++ /dev/null
@@ -1,199 +0,0 @@
-fr:
- will_paginate:
- next: Suivant
- previous: Précédent
-
- password_forgotten: Mot de passe oublié ?
- didnt_receive_confirmation: "E-mail de confirmation non reçu ?"
- didnt_receive_unlock_instructions: "E-mail de déverrouillage non reçu ?"
- resend_confirmation: Renvoyer l'email de confirmation
- submit: Valider
-
- # Generic
- no_data: Aucune donnée
-
- # controllers/informations_controller.rb
- chart_date_format: %d.%m.
-
- # controllers/sessions_controller.rb
- sign_in_success: Connection réussie
- sign_in_failure: Connection échouée, vérifiez vos identifiants
- sign_out_success: Déconnexion réussie
-
- # controllers/third_party_callbacks_controller.rb
- lr_transfer_success: "Vous avez transféré %{amount} %{currency} vers votre compte avec succès (Commission LR : %{fee} %{currency})"
- lr_transfer_failure: Votre transfert de %{amount} %{currency} a échoué
- px_transfer_canceled: Votre transfert Pecunix a été annulé
- px_transfer_success: Vous avez transféré %{amount} PGAU vers votre compte avec succès (Commission Pecunix %{fee} PGAU).
-
- # controllers/trade_orders_controller.rb
- order_saved: Votre ordre a été enregistré, il n'a pu être exécuté faute d'ordres compatibles.
- order_filled: Votre ordre a été %{how} exécuté, vous avez %{action} %{traded_btc} BTC pour %{amount} %{currency} au prix de %{ppc} %{currency}/BTC
- bought: acheté
- sold: vendu
- partially: partiellement
- completely: complètement
- order_deleted: Votre ordre a été supprimé
- change_password: Changement de mot de passe
-
- # controllers/transfers_controller.rb
- successful_transfer: Vous avez transféré %{amount} %{currency} avec succès
-
- # controllers/user_controller.rb
- account_created: Votre compte a été créé avec succès
- account_updated: Votre compte a été mis à jour avec succès
-
- # helpers/trade_orders_helper.rb
- order_dark_pool_some: Certains de ces ordres ne sont pas visibles publiquement
- order_dark_pool: Cet ordre n'est pas visible publiquement
-
- # helpers/transfers_helper.rb
- confirmations_left:
- one: En attente d'une confirmation
- other: En attente de %{count} confirmations
-
- # mailers/backup_mailer.rb
- support_from: Bitcoin Central Support <%{support_email}>
- wallet_backup_subject: Sauvegarde du wallet.dat %{date}
-
- # mailers/user_mailer.rb
- sign_up_confirmation: "Confirmation d'enregistrement"
-
- # models/*.rb + lib/validators/*.rb
- errors:
- not_yourself: ne peut pas être vous-même
-
- blank: ne peut pas être vide
-
- must_be_greater: doit-être plus grand que %{min} BTC
- greater_than_balance: est plus élevé que votre solde (%{balance} %{currency})
- greater_than_capacity: est plus élevé que vos possibilités (%{capacity} BTC bei %{ppc} BTC/%{currency})
- minimum_dark_pool_order: "Cet ordre est trop petit pour être privé"
-
- invalid: est invalide
- no_match: ne correspond pas
- answer_incorrect: est incorrecte
-
- not_your_address: ne peut pas être votre adresse
- min_amount: ne peut-être inférieur à %{minimum} %{currency}
- ppc_minimum: Le prix doit-être supérieur à 0.0001 %{currency}
-
- # views/accounts/show.html
- account_balance_title: Soldes
- currency: Devise
- balance: Solde
- balance_unconfirmed: Ce transfert est en attente de confirmations du réseau Bitcoin
-
- # views/backup_mailer/wallet_backup.text
- encrypted_wallet: Copie cryptée du wallet.dat %{date}
-
- # views/informations/economy.html
- economy_title: Économie
- how_many_generated: "Combien de Bitcoins y-a-t'il en circulation ?"
- generated_coins_html: "Il y a à l'heure actuelle %{count} Bitcoins en circulation."
-
- # views/informations/faq.html
- faq_title: Foire aux questions
-
- # views/informations/welcome.html
-
- # views/layouts/_footer.html
- footer_html: "Vous pouvez supporter ce projet en donnant à l'adresse : %{adress}"
-
- # views/sessions/new.html
- account_label: N° de compte
- account_description: Adresse e-mail ou n° de compte
- password_label: Mot de passe
- password_description: Mot de passe oublié ?
- sign_in_submit: Connexion
-
- # views/trade_orders/book.html
- order_book_title: Choisissez une devise
- amount: Montant
- price: Prix
- no_buying_orders_found: "Aucun ordre d'achat n'a été trouvé"
- no_selling_orders_found: "Aucun ordre de vente n'a été trouvé"
- total: Total
-
- # views/trades/index.html
- trade_history_title: Historique
- no_trades_found: Aucune transaction trouvée
-
- # views/transfers/index.html
- account_history_title: Historique
- currency: Devise
-
- # views/transfers/new.html
- transfer_funds_title: Transfert de fonds
- transfer_funds_body_html: "
-
Vous pouvez transférer des fonds vers :
-
-
une adresse bitcoin (BTC uniquement),
-
une adresse e-mail (toutes devises),
-
une n° de compte Bitcoin Central (toutes devises), ou
- Les transferts en bitcoins peuvent-être effectués vers un compte Bitcoin Central ou vers une adresse e-mail.
- Le transfert reste interne à Bitcoin Central dans le cas dun envoi vers une adresse bitcoin si cette adresse
- appartient à un de ses utilisateurs, sinon ils sont effectués via le réseau bitcoin.
-
-
- Les transferts entre comptes Bitcoin Central sont entièrement gratuits.
-
-
- Les transferts vers une adresse e-mail déclenchent lenvoi dun message si son propriétaire
- ne possède pas de compte Bitcoin Central, dans ce cas, le message linforme que les fonds sont
- disponibles sur Bitcoin Central. Si les fonds ne sont pas récupérés par leur destinataire ils sont
- re-crédités sur le compte de lexpéditeur après un certain temps. Cette fonctionnalité nest pas encore disponible.
-
- payee: Destinataire
- payee_id_eur: N° de compte Bitcoin Central ou adresse e-mail
- payee_id_lrusd: N° de compte Bitcoin Central, Liberty Reserve, ou adresse e-mail
- payee_id_lreur: N° de compte Bitcoin Central, Liberty Reserve, ou adresse e-mail
- payee_id_btc: N° de compte Bitcoin Central, adresse bitcoin ou e-mail
- payee_id_none: Identification du destinataire
- confirmed_balance: Votre solde disponible
- transfer_amount: Montant
- transfer_button: Transférer
-
- # views/user_mailer/registration_confirmation.html
- # views/user_mailer/registration_confirmation.text
- thanks_for_registering: "Merci d'avoir créé votre compte Bitcoin Central."
- your_account_id_is: "Votre n° de compte : %{account_id}"
-
- # views/users/_form.html
- error_updating_account:
- one: "Une erreur a empêché vos informations d'être enregistrées :"
- other: "%{count} erreurs ont empêché vos informations d'être enregistrées :"
- error_updating_password:
- one: "Une erreur a empêché votre mot de passe d'être changé :"
- other: "%{count} erreurs ont empêché votre mot de passe d'être changé :"
- email: Adresse e-mail
- new_password_explanation: Remplissez ce champ pour changer votre mot de passe
- new_password_confirmation: Confirmation
- new_password_confirmation_explanation: Confirmation du nouveau mot de passe
- current_password_explanation: Nécessaire pour protéger votre compte
-
- # views/users/edit.html
- account_details_title: Détails de votre compte
-
- # views/users/index.html
- listing_users_title: Liste des utilisateurs
- account: Compte
- password: Mot de passe
- user_show: Montrer
- user_edit: Editer
- user_destroy: Supprimer
- user_destroy_confirm: Êtes-vous sûr(e) ?
- user_new: Nouvel utilisateur
-
- # views/users/new.html
- sign_up_for_account_title: Créer un compte
-
- # Admin
- insufficient_privileges: Droits insuffisants pour visiter cette page
diff --git a/config/locales/fr/views.yml b/config/locales/fr/views.yml
deleted file mode 100644
index b22b2813..00000000
--- a/config/locales/fr/views.yml
+++ /dev/null
@@ -1,275 +0,0 @@
-fr:
- layouts:
- application:
- title: "Bitcoin-Central : Achetez et vendez des Bitcoins"
- description: Achetez, vendez et stockez vos Bitcoins de manière simple et sûre avec la meilleure plateforme Bitcoin open-source
- user_informations:
- signed_in_as: Connecté sous
- address_tip: Une nouvelle adresse est générée à chaque paiement reçu, vos adresses précédentes restent valables
- your_address: Votre adresse
- logout: Déconnexion
- sign_up: Créer un compte
- sign_in: Connexion
- navigation:
- account:
- main: Compte
- balance: Soldes
- history: Historique
- withdraw: Retirer des fonds
- deposit: Déposer des fonds
- trading:
- main: Achat/Vente
- your_orders: Ordres d'échange
- order_book: Offres en cours
- trade_history: Historique d'échanges
- admin:
- main: Administration
- transfers: Transferts
- users: Utilisateurs
- information: Informations
- pending_transfers: Opérations en attente
- help:
- main: Aide
- faq: Foire aux questions
- economy: Économie
- support: Contact
- fees: Nos Tarifs
- api_docs: API
- terms_of_service: Conditions d'utilisation
- ecommerce:
- main: E-commerce
-
- invoices:
- new:
- create_invoice: Créer une facture
- error: Erreur de création de facture
- amount_explanation: Montant à payer
- payment_explanation: Adresse de réception des fonds
- callback_url_explanation: URL de notification vers laquelle POSTer
- submit: Créer facture
- created: Facture créée avec succès
- item_url_explanation: URL de la commande sur le site du vendeur
- index:
- details: Voir le détail de la facture
- create: Créer une facture
- deleted: Facture supprimée avec succès
- confirm: Êtes-vous sûr(e) de vouloir supprimer cette facture ?
- delete: Supprimer cette facture
- show:
- details: Détails de la facture
- payee: Bénéficiaire
- payment-explanations: >
- Pour payer, transférez simplement le montant indiqué
- à l'adresse de paiement, la page se rafraîchira automatiquement
- afin de vous indiquer l'avancement du processus.
- return_to_item: Revenir sur le site du vendeur
-
- trade_orders:
- index:
- create: Passer un ordre
- active_orders: "Ordres actifs (%{count})"
- inactive_orders: "Ordres inactifs (%{count})"
- detailed_list:
- na: N/A
- sell: Vente
- buy: Achat
- market: Marché
- limit: Limite
- delete_order: Supprimer cet ordre
- delete_order_confirm: Êtes-vous sûr(e) de vouloir supprimer cet ordre ?
- activate_order: Activer l'ordre et l'exécuter
- activate_order_confirm: Êtes-vous sûr(e) de vouloir activer cet ordre ?
- book:
- bids: Achat
- asks: Vente
- list:
- price: Prix
- amount: Montant
- total: Total
- market_order: Prix du marché
- new:
- title: Nouvel ordre d'échange
- currency_explanation: Devise à échanger
- type_explanation: Les différentes méthodes de matching sont décrites dans l'aide
- category: Category
- buy: Acheter
- sell: Vendre
- sell_or_buy_explanation: Voulez-vous acheter ou vendre des Bitcoins ?
- your_balance: Votre solde
- your_balance_explanation: Votre solde dans la devise sélectionnée
- amount_explanation: Montant en BTC à échanger
- ppc_explanation: Prix pour 1 BTC
- total_explanation: Total de votre ordre
- dark_pool_explanation: Ne pas afficher l'ordre publiquement
- help: Visitez notre page d'aide si vous avez besoin d'assistance
- error:
- one: "Une erreur empêche votre ordre d'être passé :"
- other: "%{count} erreurs empêchent votre ordre d'être passé :"
-
- trades:
- index:
- title: Historique
-
- accounts:
- show:
- add_funds: Déposer des fonds
- deposit:
- not_available: Le dépôt par virement SEPA n'est pas disponible actuellement
- deposit_bitcoins_title: Ajouter des Bitcoins
- deposit_bitcoins_body_html:
-
Envoyez simplement les Bitcoins à l'adresse affichée en haut à droite de l'écran, ils apparaîtront au crédit de votre compte après quelques minutes.
- Vous pourrez utiliser ces fonds une fois la transaction confirmée (environ %{estimation} minutes).
- deposit_eur_title: Ajouter des fonds par virement
- deposit_eur_body_html: "
-
- Nous ne facturons pas de frais pour l'approvisionnement par virement SEPA en euros.
-
-
Vous devez impérativement renseigner le champ \"Commentaire\" avec votre numéro de compte,
-
Nous pouvons recevoir des virements dans une grande variété de devises,
-
Des frais peuvent s'appliquer pour les virements non SEPA, n'hésitez-pas à nous contacter
-
-
- "
- bic: BIC
- account_holder: Titulaire du compte
- iban: IBAN
- bank: Banque
- comment: Commentaire
- account_holder_address: Addresse du titulaire
- deposit_lr_title: Ajouter du Liberty Reserve
- deposit_pgau_title: Ajouter de l'or Pecunix
- deposit_pgau_body_html:
-
- Précisez la quantité d'or à ajouter en grammes, vous serez redirigé vers l'interface Pecunix afin de valider la transaction.
-
- pgau_amount: Montant (PGAU)
- deposit_pgau: Ajouter de l'or Pecunix
- other_options: Autres options
- add_bank_account: Ajouter un compte bancaire
- lr_sci_form:
- click_for_lr_html: Cliquez ici pour payer avec directement avec votre compte Liberty Reserve (LREUR et LRUSD).
-
- users:
- form:
- submit: Enregistrer
- merchant_explanation: Activer votre boutique en ligne
- ga_otp_explanation: Utiliser Google Authenticator en complément du mot de passe
- ga_otp_config: Aide et instructions de configuration
- additional_authentication_requirements: Options d'authentification
- api_tools: Outils & API
- yk_otp_config: Associer des Yubikey à votre compte
- time_zone_explanation: Utilisé pour afficher les dates et heures locales
- manage_bank_accounts: Gérez vos comptes bancaires
- registered_bank_accounts:
- zero: Vous n'avez enregistré aucun compte bancaire pour l'instant.
- one: Vous avez enregistré un compte bancaire.
- other: Vous avez enregistré %{count} comptes bancaires.
- notifications: Notifications e-mail
- notify_on_trade_explanation: Recevoir une notification quand un échange est enregistré
- ga_otp_configuration:
- reset: Le secret partagé a été ré-initialisé, vous devez mettre à jour la configuration de votre téléphone
- password_change_form:
- change_password: Changement de mot de passe
- submit: Enregistrer
- password_updated: Votre mot de passe a été changé avec succès
-
- yubikeys:
- index:
- create: Associer une Yubikey à votre compte
- delete: Supprimer cette Yubikey
- confirm: Êtes-vous sûr(e) ?
- associate: Associer une nouvelle Yubikey
- otp_explanation: Générez simplement un mot de passe Yubikey ici
- created: Yubikey associée, elle sera nécessaire pour votre prochaine authentification
- destroyed: Yubikey supprimée
- error: Cette Yubikey n'a pu être associée à votre compte
-
- devise:
- sessions:
- new:
- ga_otp_explanation: Nécessaire uniquement si vous avez activé Google Authenticator
- yk_otp_explanation: Nécessaire uniquement si vous avez activé une Yubikey
- password_explanation: Mot de passe oublié ?
- sign_in: Connexion
-
- unlocks:
- new:
- resend: Envoyer les instructions de déverrouillage
-
- transfers:
- index:
- details: Détails de la transaction
- successful:
- processed: Vous avez transféré %{amount} %{currency} avec succès
- pending: Votre demande de transfert a été correctement enregistrée, elle sera traitée très prochainement
- show:
- state:
- processed: Traité
- pending: En attente
- new:
- title: Retirer des fonds
- body_html: "
-
Les méthodes suivantes sont actuellement disponibles :
-
-
Envoi de Bitcoins,
-
Virement SEPA,
-
Transfert automatique de Liberty Reserve,
-
Paiement Pecunix manuel
-
-
- "
- error: "Des erreurs empêchent l'envoi de vos fonds :"
- max_amount: Montant maximum
- submit: Valider
- manage_bank_accounts: Gérer vos comptes bancaires
-
- bank_accounts:
- index:
- title: Ajoutez un compte bancaire
- submit: Enregistrer
- created: Compte bancaire enregistré avec succès
- error: Votre compte bancaire n'a pas pu être enregistré
- destroyed: Compte bancaire supprimé
- not_destroyed: Vous ne pouvez pas supprimer un compte bancaire vérifié ou déjà utilisé
- list:
- delete: Supprimer
- confirm: Êtes-vous certain(e) de vouloir supprimer ce compte?
-
- static_pages:
- show:
- last_modification_at: "Date de dernière modification : %{updated_at}"
-
- tickets:
- new:
- title: Ouvrez un ticket de support
- submit: Enregistrer
- description_explanation: Décrivez précisément votre demande et n'hésitez-pas à inclure tous les détails nécessaires
- error: Impossible de soumettre la demande
- index:
- successfully_created: Votre demande a été enregistrée, elle sera traitée dès que possible
- your_tickets: Vos tickets de support
- no_tickets_found: Vous n'avez ouvert aucun ticket de support
- ticket:
- add_comment: Ajouter un commentaire
- someone_wrote: %{who} avez écrit, il y a %{when}
- you: Vous
- reopen : Rouvrir le ticket
- close: Fermer le ticket
-
- informations:
- welcome:
- download: Télécharger Bitcoin 0.5.0
- source: Code source
- trading_data_title: Échanges de la semaine passée
- welcome: Bienvenue sur bitcoin-central.net !
- support:
- contact: Contactez-nous
- contact_description_html: "Vous pouvez nous contacter à l'adresse %{email}"
- please_sign_in: Vous devez vous identifier pour ouvir un ticket de support
- your_tickets:
- zero: Vous n'avez aucun ticket en cours.
- one: Vous avez un ticket en cours.
- other: Vous avez %{count} tickets en cours.
- open_a_ticket: Ouvrir un nouveau ticket
- view_tickets: Voir tous les tickets
-
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index 22166a2d..6a2c5abd 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,4 +1,5 @@
BitcoinBank::Application.routes.draw do
+
resources :invoices, :only => [:index, :new, :create, :show, :destroy]
resource :user, :only => [:edit, :update] do
@@ -31,15 +32,15 @@
:action => 'balance',
:as => 'balance',
:only => :get
-
+
get :deposit
get :pecunix_deposit_form
-
- resources :transfers, :only => [:index, :new, :create, :show]
-
- resources :trades,
+
+ resources :transfers, :only => [:index, :new, :create, :show]
+
+ resources :trades,
:only => [:index]
-
+
resources :invoices
resources :trade_orders, :only => [:index, :new, :create, :destroy] do
@@ -48,7 +49,7 @@
end
match "/s/:name" => "static_pages#show", :as => :static
-
+
match '/third_party_callbacks/:action',
:controller => :third_party_callbacks
@@ -57,29 +58,29 @@
resources :pending_transfers do
as_routes
-
+
member do
post :process_tx
end
end
-
+
resources :users do
as_routes
-
+
member do
get :balances
end
-
+
resources :account_operations do
as_routes
end
end
-
+
match '/balances', :to => 'informations#balances', :as => :balances
end
-
+
match '/qrcode/:data.png' => 'qrcodes#show', :as => :qrcode
-
+
match '/order_book' => 'trade_orders#book'
match '/trades' => 'trades#all_trades'
diff --git a/db/migrate/20101017194104_create_users.rb b/db/migrate/20101017194104_create_users.rb
index 0806cbde..7fa786b4 100644
--- a/db/migrate/20101017194104_create_users.rb
+++ b/db/migrate/20101017194104_create_users.rb
@@ -1,19 +1,53 @@
class CreateUsers < ActiveRecord::Migration
+
def self.up
- create_table :users do |t|
- t.string :account,
- :null => false
-
- t.string :email
-
- t.string :password,
- :null => false
-
- t.timestamps
+ create_table(:users) do |t|
+ ## Database authenticatable
+ t.string :email, :null => false, :default => ""
+ t.string :encrypted_password, :null => false, :default => ""
+
+ ## Recoverable
+ t.string :reset_password_token
+ t.datetime :reset_password_sent_at
+
+ ## Rememberable
+ t.datetime :remember_created_at
+
+ ## Trackable
+ t.integer :sign_in_count, :default => 0
+ t.datetime :current_sign_in_at
+ t.datetime :last_sign_in_at
+ t.string :current_sign_in_ip
+ t.string :last_sign_in_ip
+
+ # Confirmable
+ t.string :confirmation_token
+ t.datetime :confirmed_at
+ t.datetime :confirmation_sent_at
+ t.string :unconfirmed_email # Only if using reconfirmable
+
+ # Lockable
+ t.integer :failed_attempts, :default => 0 # Only if lock strategy is :failed_attempts
+ t.string :unlock_token # Only if unlock strategy is :email or :both
+ t.datetime :locked_at
+
+ # Token authenticatable
+ t.string :authentication_token
+
+ t.timestamps
+ end
+
+ add_index :users, :email, :unique => true
+ add_index :users, :reset_password_token, :unique => true
+ add_index :users, :confirmation_token, :unique => true
+ add_index :users, :unlock_token, :unique => true
+ add_index :users, :authentication_token, :unique => true
+ end
+
+ def self.down
+ # By default, we don't want to make any assumption about how to roll back a migration when your
+ # model already existed. Please edit below which fields you would like to remove in this migration.
+ drop_table :users
end
- end
- def self.down
- drop_table :users
- end
end
diff --git a/db/migrate/20110506082222_devise_create_users.rb b/db/migrate/20110506082222_devise_create_users.rb
deleted file mode 100644
index 20975821..00000000
--- a/db/migrate/20110506082222_devise_create_users.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-class DeviseCreateUsers < ActiveRecord::Migration
- def self.up
- change_table(:users) do |t|
- # t.database_authenticatable
- t.string :encrypted_password, :null => false, :default => ''
- t.string :password_salt, :null => false, :default => ''
-
- t.confirmable
- t.recoverable
- t.rememberable
- t.trackable
- t.lockable :lock_strategy => :failed_attempts, :unlock_strategy => :both
- t.token_authenticatable
- end
-
- add_index :users, :email, :unique => true
-
- execute "ALTER TABLE `users` MODIFY COLUMN `password` VARCHAR(255) NULL"
- end
-
- def self.down
- change_table :users do |t|
- t.remove :encrypted_password
- t.remove :password_salt
- t.remove :authentication_token
- t.remove :confirmation_token
- t.remove :confirmed_at
- t.remove :confirmation_sent_at
- t.remove :reset_password_token
- t.remove :remember_token
- t.remove :remember_created_at
- t.remove :sign_in_count
- t.remove :current_sign_in_at
- t.remove :last_sign_in_at
- t.remove :current_sign_in_ip
- t.remove :last_sign_in_ip
- t.remove :failed_attempts
- t.remove :unlock_token
- t.remove :locked_at
- end
- end
-end
diff --git a/db/migrate/20110702184056_bitcoin_addresses_refactoring.rb b/db/migrate/20110702184056_bitcoin_addresses_refactoring.rb
index 6e522286..b97ff552 100644
--- a/db/migrate/20110702184056_bitcoin_addresses_refactoring.rb
+++ b/db/migrate/20110702184056_bitcoin_addresses_refactoring.rb
@@ -1,11 +1,9 @@
class BitcoinAddressesRefactoring < ActiveRecord::Migration
def self.up
- rename_column :users, :last_address, :bitcoin_address
add_column :users, :last_address_refresh, :datetime
end
def self.down
- rename_column :users, :bitcoin_address, :last_address
remove_column :users, :last_address_refresh
end
end
diff --git a/db/migrate/20110713191630_create_accounts.rb b/db/migrate/20110713191630_create_accounts.rb
index 454638b1..309d50ba 100644
--- a/db/migrate/20110713191630_create_accounts.rb
+++ b/db/migrate/20110713191630_create_accounts.rb
@@ -3,7 +3,7 @@ def self.up
rename_table :users, :accounts
add_column :accounts, :parent_id, :integer
add_column :accounts, :type, :string
- rename_column :accounts, :account, :name
+ add_column :accounts, :account, :string
rename_column :account_operations, :user_id, :account_id
execute "UPDATE `accounts` SET `type`='User'"
@@ -11,7 +11,7 @@ def self.up
def self.down
rename_column :account_operations, :account_id, :user_id
- rename_column :accounts, :name, :account
+ remove_column :accounts, :account
remove_column :accounts, :parent_id
remove_column :accounts, :type
rename_table :accounts, :users
diff --git a/db/migrate/20110821132029_drop_admin_flag.rb b/db/migrate/20110821132029_drop_admin_flag.rb
index 0b9590c4..44192db1 100644
--- a/db/migrate/20110821132029_drop_admin_flag.rb
+++ b/db/migrate/20110821132029_drop_admin_flag.rb
@@ -1,9 +1,9 @@
class DropAdminFlag < ActiveRecord::Migration
- def self.up
- remove_column :accounts, :admin
- end
+ # def self.up
+ # remove_column :accounts, :admin
+ # end
- def self.down
- add_column :accounts, :admin, :boolean, :default => false
- end
+ # def self.down
+ # add_column :accounts, :admin, :boolean, :default => false
+ # end
end
diff --git a/db/schema.rb b/db/schema.rb
index 25914bc2..c49d42bb 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1,3 +1,4 @@
+# encoding: UTF-8
# This file is auto-generated from the current state of the database. Instead
# of editing this file, please use the migrations feature of Active Record to
# incrementally modify your database, and then regenerate this schema definition.
@@ -17,8 +18,8 @@
t.integer "account_id"
t.string "address"
t.decimal "amount", :precision => 16, :scale => 8, :default => 0.0
- t.datetime "created_at"
- t.datetime "updated_at"
+ t.datetime "created_at", :null => false
+ t.datetime "updated_at", :null => false
t.string "currency"
t.string "lr_transaction_id"
t.decimal "lr_transferred_amount", :precision => 16, :scale => 8, :default => 0.0
@@ -41,32 +42,31 @@
add_index "account_operations", ["lr_transaction_id"], :name => "index_transfers_on_lr_transaction_id", :unique => true
create_table "accounts", :force => true do |t|
- t.string "name", :null => false
- t.string "email"
- t.string "password"
- t.datetime "created_at"
- t.datetime "updated_at"
- t.string "bitcoin_address"
- t.string "salt"
- t.string "time_zone"
- t.string "secret_token"
+ t.string "email", :default => "", :null => false
t.string "encrypted_password", :default => "", :null => false
- t.string "password_salt", :default => "", :null => false
- t.string "confirmation_token"
- t.datetime "confirmed_at"
- t.datetime "confirmation_sent_at"
t.string "reset_password_token"
- t.string "remember_token"
+ t.datetime "reset_password_sent_at"
t.datetime "remember_created_at"
t.integer "sign_in_count", :default => 0
t.datetime "current_sign_in_at"
t.datetime "last_sign_in_at"
t.string "current_sign_in_ip"
t.string "last_sign_in_ip"
+ t.string "confirmation_token"
+ t.datetime "confirmed_at"
+ t.datetime "confirmation_sent_at"
+ t.string "unconfirmed_email"
t.integer "failed_attempts", :default => 0
t.string "unlock_token"
t.datetime "locked_at"
t.string "authentication_token"
+ t.datetime "created_at", :null => false
+ t.datetime "updated_at", :null => false
+ t.string "last_address"
+ t.string "salt"
+ t.string "time_zone"
+ t.boolean "admin", :default => false
+ t.string "secret_token"
t.boolean "merchant", :default => false
t.string "ga_otp_secret"
t.boolean "require_ga_otp", :default => false
@@ -74,22 +74,28 @@
t.boolean "require_yk_otp", :default => false
t.integer "parent_id"
t.string "type"
+ t.string "account"
t.string "full_name"
t.text "address"
+ t.string "name"
t.boolean "notify_on_trade", :default => true
t.integer "last_notified_trade_id", :default => 0, :null => false
t.integer "max_read_tx_id", :default => 0, :null => false
t.decimal "commission_rate", :precision => 16, :scale => 8
end
+ add_index "accounts", ["authentication_token"], :name => "index_users_on_authentication_token", :unique => true
+ add_index "accounts", ["confirmation_token"], :name => "index_users_on_confirmation_token", :unique => true
add_index "accounts", ["email"], :name => "index_users_on_email", :unique => true
+ add_index "accounts", ["reset_password_token"], :name => "index_users_on_reset_password_token", :unique => true
+ add_index "accounts", ["unlock_token"], :name => "index_users_on_unlock_token", :unique => true
create_table "announcements", :force => true do |t|
t.string "title"
t.text "content"
t.boolean "active"
- t.datetime "created_at"
- t.datetime "updated_at"
+ t.datetime "created_at", :null => false
+ t.datetime "updated_at", :null => false
end
create_table "bank_accounts", :force => true do |t|
@@ -98,22 +104,22 @@
t.string "iban", :null => false
t.text "account_holder"
t.string "state"
- t.datetime "created_at"
- t.datetime "updated_at"
+ t.datetime "created_at", :null => false
+ t.datetime "updated_at", :null => false
end
create_table "comments", :force => true do |t|
t.integer "user_id"
t.integer "ticket_id"
t.text "contents"
- t.datetime "created_at"
- t.datetime "updated_at"
+ t.datetime "created_at", :null => false
+ t.datetime "updated_at", :null => false
end
create_table "currencies", :force => true do |t|
t.string "code", :null => false
- t.datetime "created_at"
- t.datetime "updated_at"
+ t.datetime "created_at", :null => false
+ t.datetime "updated_at", :null => false
end
create_table "invoices", :force => true do |t|
@@ -123,8 +129,8 @@
t.string "payment_address", :null => false
t.string "callback_url", :null => false
t.datetime "paid_at"
- t.datetime "created_at"
- t.datetime "updated_at"
+ t.datetime "created_at", :null => false
+ t.datetime "updated_at", :null => false
t.string "reference", :null => false
t.string "merchant_reference"
t.string "merchant_memo"
@@ -143,8 +149,8 @@
t.decimal "traded_currency", :precision => 16, :scale => 8, :default => 0.0
t.decimal "ppc", :precision => 16, :scale => 8, :default => 0.0
t.string "currency"
- t.datetime "created_at"
- t.datetime "updated_at"
+ t.datetime "created_at", :null => false
+ t.datetime "updated_at", :null => false
t.integer "seller_id"
t.integer "buyer_id"
t.string "type"
@@ -153,8 +159,8 @@
create_table "sessions", :force => true do |t|
t.string "session_id", :null => false
t.text "data"
- t.datetime "created_at"
- t.datetime "updated_at"
+ t.datetime "created_at", :null => false
+ t.datetime "updated_at", :null => false
end
add_index "sessions", ["session_id"], :name => "index_sessions_on_session_id"
@@ -165,8 +171,8 @@
t.string "title"
t.string "locale"
t.text "contents"
- t.datetime "created_at"
- t.datetime "updated_at"
+ t.datetime "created_at", :null => false
+ t.datetime "updated_at", :null => false
end
create_table "tickets", :force => true do |t|
@@ -174,8 +180,8 @@
t.text "description"
t.integer "user_id"
t.string "state"
- t.datetime "created_at"
- t.datetime "updated_at"
+ t.datetime "created_at", :null => false
+ t.datetime "updated_at", :null => false
end
create_table "trade_orders", :force => true do |t|
@@ -184,8 +190,8 @@
t.decimal "ppc", :precision => 16, :scale => 8
t.string "currency", :null => false
t.string "category", :null => false
- t.datetime "created_at"
- t.datetime "updated_at"
+ t.datetime "created_at", :null => false
+ t.datetime "updated_at", :null => false
t.boolean "active", :default => true
t.boolean "dark_pool", :default => false, :null => false
t.boolean "dark_pool_exclusive_match", :default => false, :null => false
@@ -199,16 +205,16 @@
t.decimal "daily_limit", :precision => 16, :scale => 8, :default => 0.0
t.decimal "monthly_limit", :precision => 16, :scale => 8, :default => 0.0
t.boolean "management", :default => false
- t.datetime "created_at"
- t.datetime "updated_at"
+ t.datetime "created_at", :null => false
+ t.datetime "updated_at", :null => false
end
create_table "yubikeys", :force => true do |t|
t.integer "user_id", :null => false
t.string "key_id", :null => false
t.boolean "active", :default => true
- t.datetime "created_at"
- t.datetime "updated_at"
+ t.datetime "created_at", :null => false
+ t.datetime "updated_at", :null => false
end
end