diff --git a/Dockerfile b/Dockerfile index d97cd8cf..ae392ec6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,25 @@ ARG CRT WORKDIR $HOME COPY . $HOME +<<<<<<< HEAD +RUN apt-get update \ + && apt-get install -y \ + rsync \ + curl \ + ca-certificates \ + build-essential \ + libssl-dev \ + libffi-dev \ + python-dev \ + && chown www-data:www-data $HOME \ + && ./extra/provision.sh -m $MODE -c $TYPE -k $KEY -C $CRT -D $DOMAIN -e $EMAIL -s `pwd` --docker \ + && rm -f /var/run/hhvm/sock \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* +CMD ["./extra/service_startup.sh"] +======= RUN chown www-data:www-data $HOME RUN ./extra/provision.sh -m $MODE -c $TYPE -k $KEY -C $CRT -D $DOMAIN -e $EMAIL -s `pwd` --docker -CMD ["./extra/service_startup.sh"] \ No newline at end of file +CMD ["./extra/service_startup.sh"] +>>>>>>> master diff --git a/src/controllers/AdminController.php b/src/controllers/AdminController.php index b46b4313..acab6fa2 100644 --- a/src/controllers/AdminController.php +++ b/src/controllers/AdminController.php @@ -1195,7 +1195,7 @@ public function renderControlsContent(): :xhp { return
-

Game Controls

+

{tr('Game Controls')}

{tr('status_')}{tr('OK')} @@ -3696,7 +3696,7 @@ class="fb-cta cta--yellow js-confirm-save" class={$highlighted_color} href="#" data-action={str_replace('_', '-', $highlighted_action)}> - {$action_text} + {tr($action_text)}
diff --git a/src/inc/gameboard/modules/game-clock.php b/src/inc/gameboard/modules/game-clock.php index 48098d9c..cb6c0c45 100644 --- a/src/inc/gameboard/modules/game-clock.php +++ b/src/inc/gameboard/modules/game-clock.php @@ -98,7 +98,7 @@ class ClockModuleController { return
-
Game Clock
+
{tr('Game Clock')}
@@ -111,8 +111,8 @@ class ClockModuleController {
- [Start] - [End] + [{tr('Start')}] + [{tr('End')}] {$indicator}
@@ -121,7 +121,7 @@ class ClockModuleController { return
-
Game Clock
+
{tr('Game Clock')}
@@ -132,8 +132,8 @@ class ClockModuleController { {$milliseconds}
- [Start] - [End] + [{tr('Start')}] + [{tr('End')}] {$indicator}
diff --git a/src/language/lang_en.php b/src/language/lang_en.php index e5644cef..35419627 100644 --- a/src/language/lang_en.php +++ b/src/language/lang_en.php @@ -25,6 +25,8 @@ 'Login', 'Soon' => 'Soon', + 'In Progress' => + 'In Progress', 'Upcoming Game' => 'Upcoming Game', '_days' => @@ -140,6 +142,8 @@ 'View mode', 'Tutorial' => 'Tutorial', + 'Account' => + 'Account', 'Scoreboard' => 'Scoreboard', 'You' => @@ -227,14 +231,22 @@ 'Bases Cycle (s)', 'Default Bonus Dec' => 'Default Bonus Dec', + 'Autorun Cycle (s)' => + 'Autorun Cycle (s)', + 'Auto Announcements' => + 'Auto Announcements', 'Game Schedule' => 'Game Schedule', 'Game Start Year' => 'Game Start Year', 'Game End Year' => 'Game End Year', + 'Month' => + 'Month', 'Day' => 'Day', + 'Hour' => + 'Hour', 'Minute' => 'Minute', 'Timer' => @@ -247,6 +259,10 @@ 'Begin Time', 'Expected End Time' => 'Expected End Time', + 'LiveSync' => + 'Livesync', + 'Optional LiveSync Auth Key' => + 'Optional Livesync Auth Key', 'Internationalization' => 'Internationalization', 'Language' => @@ -255,6 +271,10 @@ 'Branding', 'Custom Logo' => 'Custom Logo', + 'Custom Organization' => + 'Custom Organization', + 'Custom Byline' => + 'Custom Byline', 'Logo' => 'Logo', 'Custom Text' => @@ -263,6 +283,8 @@ 'DELETE', 'Delete' => 'Delete', + 'Announcement Controls' => + 'Announcement Controls', 'No Announcements' => 'No Announcements', 'Game Controls' => @@ -273,8 +295,16 @@ 'Create', 'General' => 'General', - 'Back Up Database' => - 'Back Up Database', + 'Utilities' => + 'Utilities', + 'Flush Memcached' => + 'Flush Memcached', + 'Reset Database' => + 'Reset Database', + 'Restore Database' => + 'Restore Database', + 'Backup Database' => + 'Backup Database', 'Export Full Game' => 'Export Full Game', 'Import Full Game' => @@ -291,6 +321,10 @@ 'Import Levels', 'Export Levels' => 'Export Levels', + 'Import Attachments' => + 'Import Attachments', + 'Export Attachments' => + 'Export Attachments', 'Import Categories' => 'Import Categories', 'Export Categories' => @@ -329,6 +363,10 @@ 'Enabled', 'Disabled' => 'Disabled', + 'ENABLE' => + 'ENABLE', + 'DISABLE' => + 'DISABLE', 'Quiz Level' => 'Quiz Level', 'Show Answer' => @@ -499,6 +537,8 @@ 'End Game', 'Begin Game' => 'Begin Game', + 'Pause Game' => + 'Pause Game', 'Game Admin' => 'Game Admin', 'Controls' => @@ -576,12 +616,30 @@ 'end_', 'Are you sure you want to finish the current game?' => 'Are you sure you want to finish the current game?', + 'pause_' => + 'pause_', + 'Are you sure you want to pause the current game?' => + 'Are you sure you want to pause the current game?', + 'unpause_' => + 'unpause_', + 'Are you sure you want to unpause the current game?' => + 'Are you sure you want to unpause the current game?', 'Are you sure you want to logout from the game?' => 'Are you sure you want to logout from the game?', + 'delete_' => + 'delete_', + 'Are you sure you want to delete this level? All data for this level will be irreversibly removed, including scores.' => + 'Are you sure you want to delete this level? All data for this level will be irreversibly removed, including scores.', + 'Are you sure you want to delete this team? All data for this team will be irreversibly removed, including scoring logs. If you prefer to retain data, you can disable the team instead.' => + 'Are you sure you want to delete this team? All data for this team will be irreversibly removed, including scoring logs. If you prefer to retain data, you can disable the team instead.', 'Saved' => 'Saved', 'All changes have been successfully saved.' => 'All changes have been successfully saved.', + 'Imported' => + 'Imported', + 'Items have been imported successfully' => + 'Items have been imported successfully', 'Error' => 'Error', 'Sorry your form was not saved. Please correct the all errors and save again.' => @@ -590,6 +648,16 @@ 'cancel_', 'Are you sure you want to cancel? You have unsaved changes that will be reverted.' => 'Are you sure you want to cancel? You have unsaved changes that will be reverted.', + 'Database' => + 'Database', + 'restore_' => + 'restore_', + 'Are you sure you want to restore the database? This will overwrite ALL existing data!' => + 'Are you sure you want to restore the database? This will overwrite ALL existing data!', + 'reset_' => + 'reset_', + 'Are you sure you want to reset the database? This will destroy ALL data! Admin accounts will remain.' => + 'Are you sure you want to reset the database? This will destroy ALL data! Admin accounts will remain.', 'choose_logo' => 'choose_logo', 'captured_' => @@ -684,6 +752,22 @@ 'Next', 'Skip to play' => 'Skip to play', + 'account_' => + 'account_', + 'Settings' => + 'Settings', + 'Setup your FBCTF Live Sync credentials. These credentials must be the SAME on all other FBCTF instances that you are linking. DO NOT use your account password.' => + 'Setup your FBCTF Live Sync credentials. These credentials must be the SAME on all other FBCTF instances that you are linking. DO NOT use your account password.', + 'Set your live sync username' => + 'Set your live sync username', + 'Set your live sync password' => + 'Set your live sync password', + 'Link Your Google Account' => + 'Link Your Google Account', + 'Link your account with Google. You may link your FBCTF account on this instance with your Google account. Note that this will provide your email address to the administrators of this FBCTF instance.' => + 'Link your account with Google. You may link your FBCTF account on this instance with your Google account. Note that this will provide your email address to the administrators of this FBCTF instance.', + 'Close' => + 'Close', 'Powered By Facebook' => 'Powered By Facebook', 'Active Directory / LDAP' =>