[4.0] Adapt pages build script to language file changes by SharkyKZ · Pull Request #27180 · joomla/joomla-cms

SharkyKZ · 2019-11-29T09:08:04Z

Summary of Changes

Corrects language detection.

Testing Instructions

Run node build.js --build-pages or npm install/npm ci etc.
Check that no changes are made to files in Git.

Expected result

No changes.

Actual result

templates/system/incompatible.html and templates/system/build_incomplete.html are modified with erroneous language code:

@@ -4,11 +4,11 @@
   <meta http-equiv="Content-Language" content="en-GB">
   <meta name="robots" content="noindex, nofollow">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title>Joomla: unsupported PHP version</title><!-- Sets the page title, IMPORTANT DO NOT REMOVE -->
   <style>body{margin:0;padding:0;font:14px / 18px sans-serif;color:#555;background-color:transparent}html{background:#f1f1f1;background:-moz-radial-gradient(center,ellipse cover,rgba(241,241,241,1) 0,rgba(58,146,200,1) 100%);background:-webkit-radial-gradient(center,ellipse cover,rgba(241,241,241,1) 0,rgba(58,146,200,1) 100%);background:radial-gradient(ellipse at center,rgba(241,241,241,1) 0,rgba(58,146,200,1) 100%);background-repeat:no-repeat;background-attachment:fixed}ol,ul{padding:0;margin:0;list-style:none}a{color:#0084b4;text-decoration:none;outline:0}a:hover,a:focus{text-decoration:underline}p a{line-height:inherit}.container{display:flex;flex-direction:column;justify-content:center;align-items:center;position:relative;margin:0 auto;width:100%;height:100vh;overflow:hidden}.alert-main{display:block;position:relative;background:#fff;border:1px solid rgba(0,0,0,0.1);border-radius:5px;padding:20px 60px;margin:0 20px;box-shadow:0 0 10px rgba(0,0,0,0.05)}svg{position:absolute;bottom:-120px;right:-70px;width:400px;transform:rotate(10deg);z-index:-1}h1,p{position:relative;z-index:10;text-align:center;text-rendering:optimizeLegibility}h1{margin:18px 0 0;font-size:40px;font-weight:200;line-height:1;text-shadow:0 1px 2px rgba(0,0,0,.2)}p,label{margin:10px 0 20px;font-size:18px;font-weight:300;line-height:25px;color:#777}p a{font-weight:bold;color:#1c3d5c}.link-help{padding:.4rem .85rem;font-size:1rem;font-weight:normal;border-radius:.25rem;text-decoration:none;background-color:#f5f5f5;border:1px solid rgba(0,0,0,0.1)}.link-help:hover{background-color:#eee;text-decoration:none}.footer{margin:8px 20px;text-align:left;font-size:11px}.footer ul{margin-bottom:5px}.footer li{display:inline;margin:0 5px;line-height:20px}.footer li,.footer a{color:#1c3d5c}.footer a:hover{color:#59b0ff}.links{display:block;text-align:center;margin-top:4rem;margin-left:auto;margin-right:auto;font-size:1rem}.links li{display:inline-block;margin-top:20px}@media screen and (max-width:480px){.container{height:auto;padding-top:20px;padding-bottom:20px}h1{font-size:30px}.link-help{white-space:nowrap}}</style><!-- Sets the page styling, IMPORTANT DO NOT REMOVE -->
-  <script>window.errorLocale = {"en-GB":{"language":"English GB","header":"Sorry, your PHP version is not supported","text1":"Your host needs to use PHP version {{phpversion}} or newer to run this version of Joomla","help-url-text":"Help me resolve this"},"en-US":{"language":"English US","header":"Sorry, your PHP version is not supported","text1":"Your host needs to use PHP version {{phpversion}} or newer to run this version of Joomla","help-url-text":"Help me resolve this"},}</script><!-- Sets the content of the translated text, IMPORTANT DO NOT REMOVE -->
+  <script>window.errorLocale = {"joomla":{"language":"English GB","header":"Sorry, your PHP version is not supported","text1":"Your host needs to use PHP version {{phpversion}} or newer to run this version of Joomla","help-url-text":"Help me resolve this"},"joomla":{"language":"English US","header":"Sorry, your PHP version is not supported","text1":"Your host needs to use PHP version {{phpversion}} or newer to run this version of Joomla","help-url-text":"Help me resolve this"},}</script><!-- Sets the content of the translated text, IMPORTANT DO NOT REMOVE -->
 </head>
 <body ><!-- Sets the minimum PHP version, IMPORTANT DO NOT REMOVE -->
 <div class="container">
   <div class="container-main">
     <div class="alert-main">

Documentation Changes Required

No.

brianteeman · 2019-11-29T10:22:20Z

Can't find it now but I am sure it was raised before (perhaps by me)

richard67 · 2019-11-29T14:25:55Z

I have tested this item ✅ successfully on fe28a13

_{This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/27180.}

richard67 · 2019-11-29T14:29:01Z

Here a diff of one of the 2 html files without the patch of this PR, left hand side clean 4.0-dev after checkout (= correct), right hand side same file after a run of npm install:

The same but with having applied the patch before running npm shows no differences, and the correct language codes ("en-GB", "en-US") are used.

richard67 · 2019-11-29T14:29:41Z

Above screenshot just as help for other testers. PR is fine.

SharkyKZ · 2019-11-29T16:17:10Z

@brianteeman I don't think so. This PR fixes an issue introduced a few days ago with #27130.

There's #23258 raised by you but it's a different issue. It appears fixed for now but will reintroduce itself once more installation languages are added.

Quy · 2019-11-29T16:30:41Z

I have tested this item ✅ successfully on fe28a13

_{This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/27180.}

Quy · 2019-11-29T16:30:52Z

RTC

_{This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/27180.}

brianteeman · 2019-11-29T16:45:11Z

@SharkyKZ thanks for checking

dgrammatiko · 2019-11-30T20:35:02Z

AFAIK there is no known language Joomla!!
That should be either en-GB or en-US as these are the only languages in the J4 branch so far!

In other words there's more than the filenames here that needs to be patched

brianteeman · 2019-11-30T20:37:58Z

AFAIK there is no known language Joomla!!
There should be :)

SharkyKZ · 2019-11-30T20:39:43Z

@dgrammatiko Image on the right is before patch. That's what this PR fixes.

dgrammatiko · 2019-11-30T20:42:10Z

@SharkyKZ oooops, my bad! Ignore the noise

wilsonge · 2019-11-30T21:50:23Z

Thanks!

Adapt pages build script to language file changes

fe28a13

joomla-cms-bot added the RTC This Pull Request is Ready To Commit label Nov 29, 2019

Quy added the PR-4.0-dev label Nov 30, 2019

Merge branch '4.0-dev' into j4/build/pages

1f58f06

wilsonge merged commit df430a6 into joomla:4.0-dev Nov 30, 2019

joomla-cms-bot removed the RTC This Pull Request is Ready To Commit label Nov 30, 2019

wilsonge added this to the Joomla 4.0 milestone Nov 30, 2019

Uh oh!

Conversation

SharkyKZ commented Nov 29, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary of Changes

Testing Instructions

Expected result

Actual result

Documentation Changes Required

Uh oh!

brianteeman commented Nov 29, 2019

Uh oh!

richard67 commented Nov 29, 2019

Uh oh!

richard67 commented Nov 29, 2019

Uh oh!

richard67 commented Nov 29, 2019

Uh oh!

SharkyKZ commented Nov 29, 2019

Uh oh!

Quy commented Nov 29, 2019

Uh oh!

Quy commented Nov 29, 2019

Uh oh!

brianteeman commented Nov 29, 2019

Uh oh!

dgrammatiko commented Nov 30, 2019

Uh oh!

brianteeman commented Nov 30, 2019

Uh oh!

SharkyKZ commented Nov 30, 2019

Uh oh!

dgrammatiko commented Nov 30, 2019

Uh oh!

wilsonge commented Nov 30, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

SharkyKZ commented Nov 29, 2019 •

edited

Loading