Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactor badges #45

Merged
merged 2 commits into from
Nov 19, 2022
Merged

Refactor badges #45

merged 2 commits into from
Nov 19, 2022

Conversation

rtsisyk
Copy link
Member

@rtsisyk rtsisyk commented Sep 8, 2022

No description provided.

@rtsisyk rtsisyk requested a review from biodranik September 8, 2022 05:40
@cloudflare-workers-and-pages
Copy link

cloudflare-workers-and-pages bot commented Sep 8, 2022 •
edited
Loading

Deploying with  Cloudflare Pages  Cloudflare Pages

Latest commit: 60a6d45
Status: ✅  Deploy successful!
Preview URL: https://6e2de35c.organicmaps.pages.dev
Branch Preview URL: https://rt-badges.organicmaps.pages.dev

View logs

@rtsisyk
Copy link
Member Author

rtsisyk commented Sep 8, 2022

Bumped Zola version on CloudFlare to 0.16.1. 0.14.0 doesn't work with lang in short codes.

@rtsisyk
Copy link
Member Author

rtsisyk commented Sep 8, 2022 

<pre class="c_ji c_bq c_ig c_ih c_oc c_od c_cy c_oy c_ou c_os c_ot c_gs c_gt c_oe c_bs c_oz">

09:33:10.927 | Installing Zola 0.16.1
-- | --
09:33:11.803 | Started restoring cached go cache
09:33:11.824 | Finished restoring cached go cache
09:33:11.976 | go version go1.14.4 linux/amd64
09:33:11.992 | go version go1.14.4 linux/amd64
09:33:11.995 | Installing missing commands
09:33:11.995 | Verify run directory
09:33:11.996 | Executing user command: zola build
09:33:12.005 | zola: /lib/x86_64-linux-gnu/libm.so.6: version `GLIBC_2.27' not found (required by zola)
09:33:12.005 | zola: /lib/x86_64-linux-gnu/libm.so.6: version `GLIBC_2.29' not found (required by zola)
09:33:12.006 | zola: /usr/lib/x86_64-linux-gnu/libstdc++.so.6: version `GLIBCXX_3.4.26' not found (required by zola)
09:33:12.006 | zola: /lib/x86_64-linux-gnu/libc.so.6: version `GLIBC_2.28' not found (required by zola)
09:33:12.006 | zola: /lib/x86_64-linux-gnu/libc.so.6: version `GLIBC_2.27' not found (required by zola)
09:33:12.006 | zola: /lib/x86_64-linux-gnu/libc.so.6: version `GLIBC_2.25' not found (required by zola)
09:33:12.006 | zola: /lib/x86_64-linux-gnu/libc.so.6: version `GLIBC_2.29' not found (required by zola)
09:33:12.011 | Failed: build command exited with code: 1
09:33:12.766 | Failed: an internal error occurred
</pre>

Dumn!

@rtsisyk
Copy link
Member Author

rtsisyk commented Sep 8, 2022

OK, we are blocked on getzola/zola#1982.

@rtsisyk rtsisyk mentioned this pull request Sep 9, 2022
Merged
biodranik
biodranik reviewed Sep 11, 2022
View reviewed changes
templates/google_native_app_prompt.html Outdated
window.addEventListener('beforeinstallprompt', (e) => {
// Prevent Chrome 67 and earlier from automatically showing the prompt
e.preventDefault();
const add = document.getElementById('add');
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's make it var for older browsers.

templates/shortcodes/badges.html
<a href="https://apps.apple.com/app/organic-maps/id1567437057" title="{{ trans(key='install-appstore', lang=lang) }}"><img src="/images/badges/googleplay.svg"></a>
</span>
<span class="badge">
<a href="https://play.google.com/store/apps/details?id=app.organicmaps&hl={{ lang }}" title="{{ trans(key='install-googleplay', lang=lang) }}"><img src="/images/badges/apple-appstore.svg"></a>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it possible to pass the translation into the shortcode from the md file?

@rtsisyk @biodranik
Move badges from Markdown to HTML
be9ea0d 
Markdown should contain content, not HTML and JS code.

Signed-off-by: Roman Tsisyk <[email protected]>
@biodranik biodranik force-pushed the rt-badges branch 2 times, most recently from 060cdbd to 6a29c56 Compare November 19, 2022 14:12
@biodranik
Copy link
Member

Поправил, чтобы lang передавался явно. Потом исправим, когда CF обновит ядро и можно будет использовать самую свежую Zola.

@biodranik biodranik merged commit 280730b into master Nov 19, 2022
@biodranik biodranik deleted the rt-badges branch November 19, 2022 16:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@biodranik biodranik biodranik left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@rtsisyk @biodranik