Upstream sync

This commit is contained in:
Senad Uka
2020-08-20 06:50:51 +02:00
parent 190ff2854b
commit 41bf88e358
127 changed files with 1399 additions and 565 deletions

View File

@@ -49,4 +49,5 @@ Rails.application.configure do
ENV["ENABLE_ANALYTICS"] = "true"
ENV["BRAYNIAC_AI_API_ENDPOINT"] ||= ""
ENV["MILLICAST_API_SECRET"] ||= ""
end

View File

@@ -0,0 +1,2 @@
require "millicast"

View File

@@ -62,12 +62,12 @@ en:
empty: Acquired Media Releases will appear here
table_headers:
approved: Approved
file_infos_count: No. Files
files_count: No. Files
name: Name
notes: Notes
owner_info: Owner Info
signed_at: Date Signed
tags: Tags
owner_info: Owner Info
new:
heading: Import Acquired Media Release
update:
@@ -141,7 +141,10 @@ en:
actions:
manage: Manage
review: Review
sign_amendment: Sign Additional Clause
messages:
amendment_not_signed_tooltip: Additional Clause Not Yet Signed
amendment_signed_tooltip: Additional Clause Signed
approved_tooltip: Approved by %{user} on %{timestamp}
no_photos: Needs Photo
create:
@@ -174,6 +177,7 @@ en:
empty: Appearance Releases will appear here
imported_appearance_release_missing_attachment: Person photo or contract missing for imported appearance release
table_headers:
amendment_signed: Additional Clause
approved: Approved
contact_info: Contact info
name: Name
@@ -227,6 +231,7 @@ en:
broadcast_recordings:
confirm_hide: Are you sure you want to hide this recording from everyone?
create:
alert: A live stream could not be created. Please try again later or contact support.
notice: A live stream has been created
destroy:
alert: A live stream has been deleted
@@ -307,6 +312,10 @@ en:
custom_fields:
heading: Questionnaire
instructions: Please list the questions you wish the signer to answer. Any unused question fields will be hidden.
exhibits:
heading: Exhibits
help:
option_field: Leave blank if not required for this contract.
exploitable_rights:
heading: Exploitable Rights
legal:
@@ -347,10 +356,16 @@ en:
contracts:
amendment_page:
description_labels:
amendment_clause: Amendment Clause
amendment_signature: Amendment Signature
amendment_signer_name: Amendment Signer Name
heading: Amendment
amendment_clause: Clause
amendment_signature: Clause Signature
amendment_signer_name: Clause Signer Name
heading: Additional Clause
exhibit_a_page:
heading:
appearance_release: Exhibit A
exhibit_b_page:
heading:
appearance_release: Exhibit B
for_office_use_only:
description_labels:
date_issued: Date Issued
@@ -370,6 +385,7 @@ en:
other: Minor photos
questionnaire:
heading:
appearance_release: Questionnaire
medical_release: Medical Questionnaire
misc_release: Questionnaire
signature_page:
@@ -431,17 +447,16 @@ en:
download_type: Type
errors_helper:
failure_message: "The following errors have prevented this %{model_name} from being submitted:"
file_infos:
files:
edit:
heading: Add Media
update:
notice: The release has been updated
heading: Media
helpers:
help:
contract_template:
amendment_clause: Leave blank if not required for this contract
fee: Leave at $0.00 for no-fee
guardian_clause: Leave blank if not required for this contract
questionnaire_legal_text: Leave blank if not required for this contract
signature_legal_text: Leave blank if not required for this contract
task_request:
time_allowed: Minimum of 2 hours, no partial hours allowed
@@ -829,6 +844,8 @@ en:
location_releases:
create:
notice: The location release has been created
csv:
no_amendment_clause: No additional contract clause
destroy:
alert: The location release has been deleted
edit:
@@ -853,6 +870,7 @@ en:
table_headers:
address: Address
amendment_signed: Additional Clause
amendment_signed_column: Additional Clause
approved: Approved
location_info: Location Info
notes: Notes
@@ -865,8 +883,8 @@ en:
review: Review
sign_amendment: Sign Additional Clause
messages:
amendment_not_signed_tooltip: Amendment not yet signed
amendment_signed_tooltip: Amendment Signed
amendment_not_signed_tooltip: Additional clause not yet signed
amendment_signed_tooltip: Additional clause signed
approved_tooltip: Approved by %{user} on %{timestamp}
no_photos: Needs Photo
new:
@@ -932,7 +950,6 @@ en:
empty: Medical releases will appear here
table_headers:
approved: Approved
approved?: Approved
contact_info: Contact info
name: Person name
notes: Notes
@@ -1082,9 +1099,13 @@ en:
actions:
folder: Add Folder
new: Create New Project
search: Search
heading: Open Projects
new:
heading: Create New Project
new_project_button:
actions:
new: Create New Project
project:
actions:
delete: Delete
@@ -1142,12 +1163,12 @@ en:
heading: Signature
amendments:
create:
amendment_already_signed_message: Release amendment is already signed!
amendment_signed_message: Release amendment signed successfully! Thank you
amendment_already_signed_message: Release additional clause is already signed!
amendment_signed_message: Release additional clause signed successfully! Thank you
new:
amendment:
heading: Additional Clause
copy_url: Copy sign amendment URL
copy_url: Copy sign additional clause URL
signature:
heading: Signature
signed_contract_preview: Signed Contract Preview
@@ -1156,6 +1177,11 @@ en:
notice: Your release has been signed. Thank you!
new:
cancel: Cancel
exhibits:
exhibit_a:
heading: Exhibit A
exhibit_b:
heading: Exhibit B
guardian_2_info:
heading: Second Guardian Information (if company requires)
guardian_2_photo:
@@ -1185,6 +1211,8 @@ en:
no_photo: No photo yet
take_photo: Take Photo
warning: If your photo appears sideways, it will be autocorrected when you submit your release.
questionnaire:
heading: Questionnaire
signature:
heading: Sign Below
broadcasts:

View File

@@ -16,12 +16,13 @@ es:
heading: Guardian Photo
index:
table_headers:
approved: Appproved (ES)
file_infos_count: No. Files (ES)
name: Name (ES)
notes: Notes (ES)
owner_info: Owner Info (ES)
signed_at: Date Signed (ES)
tags: Tags (ES)
owner_info: Owner Info (ES)
activerecord:
attributes:
appearance_release:
@@ -46,6 +47,13 @@ es:
models:
appearance_release: Autorización de Aparacimiento
appearance_releases:
appearance_release:
actions:
manage: Manage (ES)
sign_amendment: Sign Additional Clause (ES)
messages:
amendment_not_signed_tooltip: Amendment not yet signed (ES)
amendment_signed_tooltip: Amendment signed (ES)
create:
failed_import: Failed to create appearance release for files listed below (ES)
matching_started: Matching started (ES)
@@ -65,6 +73,8 @@ es:
index:
imported_appearance_release_missing_attachment: Person photo or contract missing for imported appearance release (ES)
table_headers:
amendment_signed: Additional Clause (ES)
approved: Approved (ES)
contact_info: ""
name: ""
notes: ""
@@ -170,7 +180,7 @@ es:
amendment_clause: Amendment Clause (ES)
amendment_signature: Amendment Signature (ES)
amendment_signer_name: Amendment Signer Name (ES)
heading: Amendment (ES)
heading: Secondary Clause (ES)
for_office_use_only:
description_labels:
date_issued: Date Issued (ES)
@@ -405,6 +415,8 @@ es:
update: Approve (ES)
update: 'Actualizar %{model}'
location_releases:
csv:
no_amendment_clause: No amendment clause (ES)
form:
photos:
dropzone_label: Tap to take a photo of the Property (optional) (ES)
@@ -412,6 +424,8 @@ es:
table_headers:
address: Address (ES)
amendment_signed: Additional Clause (ES)
amendment_signed_column: Amendment signed (ES)
approved: Approved (ES)
notes: Notes (ES)
signed_at: Date Signed (ES)
tags: Tags (ES)
@@ -437,6 +451,7 @@ es:
heading: Guardian Photo
index:
table_headers:
approved: Approved (ES)
name: Name (ES)
notes: Notes (ES)
owner_info: Owner Info
@@ -448,7 +463,6 @@ es:
index:
table_headers:
approved: Approved (ES)
approved?: Approved (ES)
contact_info: Contact info (ES)
name: Person name (ES)
notes: Notes (ES)
@@ -462,6 +476,7 @@ es:
misc_releases:
index:
table_headers:
approved: Approved (ES)
contact_info: Contact info (ES)
name: Person name (ES)
notes: Notes (ES)
@@ -470,6 +485,7 @@ es:
music_releases:
index:
table_headers:
approved: Approved (ES)
composers_count: No. Composers (ES)
file_infos_count: No. Files (ES)
name: Name (ES)
@@ -631,6 +647,7 @@ es:
heading: Guardian Photo (ES)
index:
table_headers:
approved: Approved (ES)
email: Email (ES)
name: Name (ES)
notes: Notes (ES)

View File

@@ -19,8 +19,8 @@ Rails.application.routes.draw do
concern :taggable do
resources :acts_as_taggable_on_tags, only: [:new, :create, :destroy], controller: "tags"
end
concern :file_infoable do
resource :file_infos, only: [:edit, :update]
concern :file_uploadable do
resource :files, only: [:edit, :update]
end
concern :approvable do
resource :approvals, only: [:new, :create]
@@ -51,7 +51,7 @@ Rails.application.routes.draw do
resource :account, only: [:new, :create, :update]
resources :account_auths, only: [:index, :create, :update, :destroy]
resources :projects, shallow: true do
resources :acquired_media_releases, except: [:show], concerns: [:contractable, :notable, :file_infoable]
resources :acquired_media_releases, except: [:show], concerns: [:contractable, :notable, :file_uploadable]
resources :appearance_releases, except: [:show], concerns: [:contractable, :notable]
resources :appearance_release_imports, only: [:create]
resources :location_releases, except: [:show], concerns: [:contractable, :notable, :photoable]
@@ -131,7 +131,9 @@ Rails.application.routes.draw do
resources :projects, only: [] do
resources :contract_templates, only: [:index] do
resources :talent_releases, only: [:new, :create]
resources :appearance_releases, only: [:new, :create]
resources :appearance_releases, only: [:new, :create] do
resources :amendments, only: [:new, :create]
end
resources :acquired_media_releases, only: [:new, :create]
resources :location_releases, only: [:new, :create] do
resources :amendments, only: [:new, :create]