diff --git a/build.bat b/build.bat index dc16f3bd..5a92ca26 100644 --- a/build.bat +++ b/build.bat @@ -22,6 +22,8 @@ echo "Copying Ember pdfjs folder" robocopy /e /NFL /NDL /NJH gui\dist-prod\pdfjs edition\static\public\pdfjs echo "Copying Ember sections folder" robocopy /e /NFL /NDL /NJH gui\dist-prod\sections edition\static\public\sections +echo "Copying i18n folder" +robocopy /e /NFL /NDL /NJH gui\dist-prod\i18n edition\static\public\i18n copy gui\dist-prod\*.* edition\static copy gui\dist-prod\favicon.ico edition\static\public @@ -32,6 +34,10 @@ mkdir edition\static\mail copy domain\mail\*.html edition\static\mail copy core\database\templates\*.html edition\static +rd /s /q edition\static\i18n +mkdir edition\static\i18n +robocopy /e /NFL /NDL /NJH gui\dist-prod\i18n\*.json edition\static\i18n + rd /s /q edition\static\scripts mkdir edition\static\scripts mkdir edition\static\scripts\mysql diff --git a/build.sh b/build.sh index 92a86f72..3b9dc6dc 100755 --- a/build.sh +++ b/build.sh @@ -20,6 +20,7 @@ cp -r gui/dist-prod/prism edition/static/public/prism cp -r gui/dist-prod/sections edition/static/public/sections cp -r gui/dist-prod/tinymce edition/static/public/tinymce cp -r gui/dist-prod/pdfjs edition/static/public/pdfjs +cp -r gui/dist-prod/i18n edition/static/public/i18n cp gui/dist-prod/*.* edition/static cp gui/dist-prod/favicon.ico edition/static/public cp gui/dist-prod/manifest.json edition/static/public @@ -29,6 +30,10 @@ mkdir -p edition/static/mail cp domain/mail/*.html edition/static/mail cp core/database/templates/*.html edition/static +rm -rf edition/static/i18n +mkdir -p edition/static/i18n +cp -r gui/dist-prod/i18n/*.json edition/static/i18n + rm -rf edition/static/scripts mkdir -p edition/static/scripts mkdir -p edition/static/scripts/mysql diff --git a/core/database/templates/db-error.html b/core/database/templates/db-error.html index 4272b0bd..e8ca9a8f 100644 --- a/core/database/templates/db-error.html +++ b/core/database/templates/db-error.html @@ -14,7 +14,7 @@ html { -webkit-font-smoothing: antialiased; } - + body { font-family: 'Open Sans', sans-serif; background-color: #1b75bb; @@ -22,54 +22,54 @@ color: #ffffff; padding-top: 50px; } - + .container { max-width: 1200px; margin: 0 auto; text-align: center; } - + .logo { margin: 0 15px; } - + .content { margin: 0 15px; } - + .content > div { margin: 50px 0; } - + .content h1 { font-size: 24px; font-weight: 400; text-transform: uppercase; margin: 0 0 30px; } - + .content p { font-size: 18px; line-height: 28px; margin: 30px 0 0 0; } - + .content .image { text-align: center; } - + .clearfix { overflow: auto; zoom: 1; } - + .btn-main { border: 1px solid #ffffff; padding: 12px 20px; border-radius: 5px; margin-left: 25px; } - + @media (min-width: 768px) { body { margin-top: 100px; @@ -102,7 +102,7 @@