Upstream sync

This commit is contained in:
Senad Uka
2020-06-11 16:56:29 +02:00
parent dc9ba08e1b
commit 5f5e6c18b5
60 changed files with 1218 additions and 134 deletions

View File

@@ -1,4 +1,6 @@
require 'zoom'
require 'zoom_gateway'
unless Rails.env.test?
Zoom.configure do |c|
c.api_key = ENV['ZOOM_API_KEY']

View File

@@ -555,6 +555,7 @@ en:
location_details:
heading: 1 of 4 Location Details
photos:
dropzone_label: Tap to take a photo of the Property (optional)
heading: 4 of 4 Photos
signer_details:
heading: 2 of 4 Owner Details
@@ -589,6 +590,7 @@ en:
material_details:
heading: 1 of 3 Material Details
photos:
dropzone_label: Tap to take a photo of Licensed Material (optional)
heading: 4 of 4 Photos
signer_details:
heading: 2 of 4 Licensor/Owner Details
@@ -609,6 +611,20 @@ en:
heading: Import Material Release (Products / Logos)
update:
notice: The material release has been updated
medical_releases:
destroy:
alert: The medical release has been deleted
index:
actions:
search: Search
empty: Medical releases will appear here
table_headers:
notes: Notes
signed_at: Date Signed
tags: Tags
medical_release:
actions:
manage: Manage
music_releases:
create:
notice: The music release has been created
@@ -714,6 +730,7 @@ en:
label: Which release categories do you require for this project?
location_release: Location Releases
material_release: Material Releases (Products / Logos)
medical_release: Medical Releases
music_release: Music Releases (Original Music)
talent_release: Talent Releases
index:
@@ -740,6 +757,7 @@ en:
downloads: Downloads
location_release: Location Releases (%{count})
material_release: Material Releases (%{count})
medical_release: Medical Releases (%{count})
music_release: Music Releases (%{count})
report: Reports
talent_release: Talent Releases (%{count})
@@ -800,6 +818,8 @@ en:
heading: Legal
location_info:
heading: Location Information
photos:
heading: Photos
signature:
heading: Sign Below
material_releases:
@@ -811,10 +831,28 @@ en:
heading: Licensor/Owner Contact Information
legal:
heading: Legal
photo:
heading: Photos
release_info:
heading: Release Information
signature:
heading: Sign Below
medical_releases:
create:
notice: Your release has been signed. Thank you!
new:
cancel: Cancel
instructions_html: >
Below is the medical release form. After scrolling down and reading the medical release form, please enter your personal information, take a photo, and press the "Submit Release" button.
legal:
heading: Legal
personal_info:
heading: Personal Information
instructions: Now, enter your personal information.
photo:
heading: Photos
signature:
heading: Signature
talent_releases:
create:
notice: Your release has been signed. Thank you!

View File

@@ -132,6 +132,14 @@ es:
update: Save Changes (ES)
create: 'Crear %{model}'
update: 'Actualizar %{model}'
location_releases:
form:
photos:
dropzone_label: Tap to take a photo of the Property (optional) (ES)
material_releases:
form:
photos:
dropzone_label: Tap to take a photo of Licensed Material (optional) (ES)
public:
appearance_releases:
create:
@@ -160,6 +168,14 @@ es:
clear: Despejar
heading: Firma
instructions: 'Firma Abajo:'
location_releases:
new:
photos:
heading: Photos (ES)
material_releases:
new:
photo:
heading: Photos (ES)
talent_releases:
new:
guardian_clause:

View File

@@ -53,6 +53,7 @@ Rails.application.routes.draw do
resources :material_releases, except: [:show], concerns: [:contractable, :notable, :photoable]
resources :music_releases, except: [:show], concerns: [:contractable, :notable]
resources :talent_releases, except: [:show], concerns: [:contractable, :notable, :photoable]
resources :medical_releases, except: [:show], concerns: [:contractable, :notable, :photoable]
resources :contract_templates, only: [:index, :new, :create, :destroy] do
resource :qr_codes, only: [:show], controller: "contract_templates/qr_codes"
resource :blank_contracts, only: [:show, :new, :create], controller: "contract_templates/blank_contracts"
@@ -117,6 +118,7 @@ Rails.application.routes.draw do
resources :acquired_media_releases, only: [:new, :create]
resources :location_releases, only: [:new, :create]
resources :material_releases, only: [:new, :create]
resources :medical_releases, only: [:new, :create]
end
end
end
@@ -126,7 +128,7 @@ Rails.application.routes.draw do
end
RELEASES = [:acquired_media_releases, :appearance_releases, :talent_releases, :material_releases, :location_releases]
ALL_RELEASES = RELEASES + [:music_releases]
ALL_RELEASES = RELEASES + [:music_releases, :medical_releases]
ALL_RELEASES.each do |release|
resources release, only: [], concerns: :taggable