Skip to content

Commit

Permalink
Fix/circleci automation and touchups (#141)
Browse files Browse the repository at this point in the history
* testing new circleci automation replacement

* add a pull_request template

* tweaky tweaky

* rake task

* fix dependabot alert

* readme touchups

* minor tweak to sidebar style, link to source

* add the badge
  • Loading branch information
untra authored Jul 1, 2021
1 parent 0c95b5e commit da2a900
Show file tree
Hide file tree
Showing 9 changed files with 70 additions and 75 deletions.
6 changes: 6 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,12 @@ jobs:
- ruby/install-deps
# Run rspec in parallel
- ruby/rspec-test
- run:
name: Run unit tests using Rails
command: |
RAILS_ENV=test bundle exec rake
- store_test_results:
path: test/reports

# We use workflows to orchestrate the jobs that we declared above.
workflows:
Expand Down
21 changes: 21 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
## 🔤 Polyglot PR

> Description here
<!-- thanks for making a pull request! you are a handsome and kind individual, and you should be proud of your accomplishments -->

![add a sweet (optional) meme](giphy-url.gif)

## Type of change

- [ ] Docs update (changes to the readme or a site page, no code changes)
- [ ] Ops wrangling (automation or test improvements)
- [ ] Bug fix (non-breaking change that fixes an issue)
- [ ] New feature (non-breaking change that adds functionality)
- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
- [ ] Sweet release (needs a lot of work and effort)
- [ ] Something else (explain please)

### Checklists

- [ ] If modifying code, at least one test has been added to the suite
8 changes: 0 additions & 8 deletions .gitlab-ci.yml

This file was deleted.

27 changes: 0 additions & 27 deletions .travis.yml

This file was deleted.

4 changes: 2 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -217,14 +217,14 @@ GEM
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
mercenary (0.3.6)
mini_portile2 (2.5.0)
mini_portile2 (2.5.3)
minima (2.5.1)
jekyll (>= 3.5, < 5.0)
jekyll-feed (~> 0.9)
jekyll-seo-tag (~> 2.1)
minitest (5.14.4)
multipart-post (2.1.1)
nokogiri (1.11.3)
nokogiri (1.11.7)
mini_portile2 (~> 2.5.0)
racc (~> 1.4)
octokit (4.20.0)
Expand Down
10 changes: 6 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
:abc: Polyglot
🔤 Polyglot
---
[![Gem Version](https://badge.fury.io/rb/jekyll-polyglot.svg)](https://badge.fury.io/rb/jekyll-polyglot)
[![Build Status](https://travis-ci.org/untra/polyglot.svg?branch=master)](https://travis-ci.org/untra/polyglot)
[![CircleCI](https://circleci.com/gh/untra/polyglot/tree/master.svg?style=svg)](https://circleci.com/gh/untra/polyglot/?branch=master)

__Polyglot__ is a fast, painless, open-source internationalization plugin for [Jekyll](http://jekyllrb.com) blogs. Polyglot is easy to setup and use with any Jekyll project, and it scales to the languages you want to support. With fallback support for missing content, automatic url relativization, and powerful SEO tools, Polyglot allows any multi-language jekyll blog to focus on content without the cruft.

Expand Down Expand Up @@ -179,7 +179,8 @@ This plugin stands out from other I18n Jekyll plugins.
Jekyll-polyglot has a few spectacular [Search Engine Optimization techniques](https://untra.github.io/polyglot/seo) to ensure your Jekyll blog gets the most out of it's multilingual audience. Check them out!

### Other Websites Built with Polyglot
let us know if you make a multilingual blog you want to share:
Feel free to open a PR and list your multilingual blog here you may want to share:

* [Polyglot project website](https://polyglot.untra.io)
* [LogRhythm Corporate Website](https://logrhythm.com)
* [All Over Earth](https://allover.earth/)
Expand All @@ -204,14 +205,15 @@ But for real I would appreciate any contributions and support. This started as a
If you have something you'd like to contribute to jekyll-polyglot, please open a PR!


## Roadmap
## 2.0 Roadmap
* [ ] - **site language**: portuguese `pt_BR` `pt_PT`
* [ ] - **site language**: arabic `ar`
* [ ] - **site language**: japanese `ja`
* [x] - **site language**: russian `ru`
* [ ] - **site language**: korean `ko`
* [ ] - **site language**: hebrew `he`
* [ ] - get whitelisted as an official github-pages jekyll plugin
* [x] - update CI provider

## Copyright
Copyright (c) Samuel Volin 2021. License: MIT
62 changes: 31 additions & 31 deletions rspec.xml
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
<?xml version="1.0" encoding="UTF-8"?>
<testsuite name="rspec" tests="29" skipped="0" failures="0" errors="0" time="0.102705" timestamp="2021-04-18T18:33:34-06:00" hostname="Samuels-MacBook-Pro.local">
<testsuite name="rspec" tests="29" skipped="0" failures="0" errors="0" time="0.099771" timestamp="2021-06-29T21:47:58-06:00" hostname="Samuels-MacBook-Pro.local">
<properties>
<property name="seed" value="25451"/>
<property name="seed" value="51139"/>
</properties>
<testcase classname="spec.jekyll.polyglot.hooks.coordinate_spec" name="hook_coordinate should have trailing / on all dir entries in exclude_from_localization" file="./spec/jekyll/polyglot/hooks/coordinate_spec.rb" time="0.011480"></testcase>
<testcase classname="spec.jekyll.polyglot.hooks.coordinate_spec" name="hook_coordinate should merge the site.data.active_lang to the site.data" file="./spec/jekyll/polyglot/hooks/coordinate_spec.rb" time="0.000792"></testcase>
<testcase classname="spec.jekyll.polyglot.hooks.coordinate_spec" name="hook_coordinate should fall back to the default_lang when using translated site data" file="./spec/jekyll/polyglot/hooks/coordinate_spec.rb" time="0.000607"></testcase>
<testcase classname="spec.jekyll.polyglot.hooks.coordinate_spec" name="hook_coordinate test fixtures in the default lang" file="./spec/jekyll/polyglot/hooks/coordinate_spec.rb" time="0.035212"></testcase>
<testcase classname="spec.jekyll.polyglot.hooks.coordinate_spec" name="hook_coordinate should include files in the default_lang without active_lang" file="./spec/jekyll/polyglot/hooks/coordinate_spec.rb" time="0.008109"></testcase>
<testcase classname="spec.jekyll.polyglot.hooks.coordinate_spec" name="hook_coordinate should include files in the active_lang" file="./spec/jekyll/polyglot/hooks/coordinate_spec.rb" time="0.005576"></testcase>
<testcase classname="spec.jekyll.polyglot.hooks.coordinate_spec" name="hook_coordinate should not include files in the default_lang with the active_lang" file="./spec/jekyll/polyglot/hooks/coordinate_spec.rb" time="0.005602"></testcase>
<testcase classname="spec.jekyll.polyglot.hooks.coordinate_spec" name="hook_coordinate should not include files in a different lang from the active_lang" file="./spec/jekyll/polyglot/hooks/coordinate_spec.rb" time="0.007601"></testcase>
<testcase classname="spec.jekyll.polyglot.hooks.coordinate_spec" name="hook_coordinate should not be included if the active_lang is not part of the lang-exclusive" file="./spec/jekyll/polyglot/hooks/coordinate_spec.rb" time="0.005394"></testcase>
<testcase classname="spec.jekyll.polyglot.patches.jekyll.site_spec" name="Jekyll::Site must match common default urls made by jekyll" file="./spec/jekyll/polyglot/patches/jekyll/site_spec.rb" time="0.001440"></testcase>
<testcase classname="spec.jekyll.polyglot.patches.jekyll.site_spec" name="Jekyll::Site expect not match natural unfortunate urls" file="./spec/jekyll/polyglot/patches/jekyll/site_spec.rb" time="0.000661"></testcase>
<testcase classname="spec.jekyll.polyglot.patches.jekyll.site_spec" name="Jekyll::Site should default to true if parallel_localization if not set" file="./spec/jekyll/polyglot/patches/jekyll/site_spec.rb" time="0.000696"></testcase>
<testcase classname="spec.jekyll.polyglot.patches.jekyll.site_spec" name="Jekyll::Site should be false if explicitly set" file="./spec/jekyll/polyglot/patches/jekyll/site_spec.rb" time="0.000633"></testcase>
<testcase classname="spec.jekyll.polyglot.patches.jekyll.site_spec" name="Jekyll::Site must match certain strings with any simple baseurl" file="./spec/jekyll/polyglot/patches/jekyll/site_spec.rb" time="0.000876"></testcase>
<testcase classname="spec.jekyll.polyglot.patches.jekyll.site_spec" name="Jekyll::Site must match with an empty baseurl" file="./spec/jekyll/polyglot/patches/jekyll/site_spec.rb" time="0.000639"></testcase>
<testcase classname="spec.jekyll.polyglot.patches.jekyll.site_spec" name="Jekyll::Site must not match external urls" file="./spec/jekyll/polyglot/patches/jekyll/site_spec.rb" time="0.000741"></testcase>
<testcase classname="spec.jekyll.polyglot.patches.jekyll.site_spec" name="Jekyll::Site must not match excluded urls" file="./spec/jekyll/polyglot/patches/jekyll/site_spec.rb" time="0.000893"></testcase>
<testcase classname="spec.jekyll.polyglot.patches.jekyll.site_spec" name="Jekyll::Site must not match excluded urls with a set baseurl" file="./spec/jekyll/polyglot/patches/jekyll/site_spec.rb" time="0.000818"></testcase>
<testcase classname="spec.jekyll.polyglot.patches.jekyll.site_spec" name="Jekyll::Site must not match localized urls" file="./spec/jekyll/polyglot/patches/jekyll/site_spec.rb" time="0.000812"></testcase>
<testcase classname="spec.jekyll.polyglot.patches.jekyll.site_spec" name="Jekyll::Site must not match localized urls with a set baseurl" file="./spec/jekyll/polyglot/patches/jekyll/site_spec.rb" time="0.000818"></testcase>
<testcase classname="spec.jekyll.polyglot.patches.jekyll.site_spec" name="Jekyll::Site disabled relativization must match ferh relative url with baseurl" file="./spec/jekyll/polyglot/patches/jekyll/site_spec.rb" time="0.000820"></testcase>
<testcase classname="spec.jekyll.polyglot.patches.jekyll.site_spec" name="Jekyll::Site must match absolute url" file="./spec/jekyll/polyglot/patches/jekyll/site_spec.rb" time="0.000755"></testcase>
<testcase classname="spec.jekyll.polyglot.patches.jekyll.site_spec" name="Jekyll::Site must match absolute url" file="./spec/jekyll/polyglot/patches/jekyll/site_spec.rb" time="0.000729"></testcase>
<testcase classname="spec.jekyll.polyglot.patches.jekyll.site_spec" name="Jekyll::Site must not match absolute url for another project" file="./spec/jekyll/polyglot/patches/jekyll/site_spec.rb" time="0.000744"></testcase>
<testcase classname="spec.jekyll.polyglot.patches.jekyll.site_spec" name="Jekyll::Site must not match whitespaced urls" file="./spec/jekyll/polyglot/patches/jekyll/site_spec.rb" time="0.000765"></testcase>
<testcase classname="spec.jekyll.polyglot.patches.jekyll.site_spec" name="Jekyll::Site must match absolute url with baseurl" file="./spec/jekyll/polyglot/patches/jekyll/site_spec.rb" time="0.000954"></testcase>
<testcase classname="spec.jekyll.polyglot.patches.jekyll.site_spec" name="Jekyll::Site disabled relativization must match ferh absolute url with baseurl" file="./spec/jekyll/polyglot/patches/jekyll/site_spec.rb" time="0.000876"></testcase>
<testcase classname="spec.jekyll.polyglot.patches.jekyll.site_spec" name="Jekyll::Site negative lookbehind for hreflang, which god help me if this severely hampers performance" file="./spec/jekyll/polyglot/patches/jekyll/site_spec.rb" time="0.000928"></testcase>
<testcase classname="spec.jekyll.polyglot.patches.jekyll.site_spec" name="Jekyll::Site should copy active_lang to additional variables" file="./spec/jekyll/polyglot/patches/jekyll/site_spec.rb" time="0.000870"></testcase>
<testcase classname="spec.jekyll.polyglot.hooks.coordinate_spec" name="hook_coordinate should have trailing / on all dir entries in exclude_from_localization" file="./spec/jekyll/polyglot/hooks/coordinate_spec.rb" time="0.008118"></testcase>
<testcase classname="spec.jekyll.polyglot.hooks.coordinate_spec" name="hook_coordinate should merge the site.data.active_lang to the site.data" file="./spec/jekyll/polyglot/hooks/coordinate_spec.rb" time="0.000575"></testcase>
<testcase classname="spec.jekyll.polyglot.hooks.coordinate_spec" name="hook_coordinate should fall back to the default_lang when using translated site data" file="./spec/jekyll/polyglot/hooks/coordinate_spec.rb" time="0.000766"></testcase>
<testcase classname="spec.jekyll.polyglot.hooks.coordinate_spec" name="hook_coordinate test fixtures in the default lang" file="./spec/jekyll/polyglot/hooks/coordinate_spec.rb" time="0.034464"></testcase>
<testcase classname="spec.jekyll.polyglot.hooks.coordinate_spec" name="hook_coordinate should include files in the default_lang without active_lang" file="./spec/jekyll/polyglot/hooks/coordinate_spec.rb" time="0.009102"></testcase>
<testcase classname="spec.jekyll.polyglot.hooks.coordinate_spec" name="hook_coordinate should include files in the active_lang" file="./spec/jekyll/polyglot/hooks/coordinate_spec.rb" time="0.006309"></testcase>
<testcase classname="spec.jekyll.polyglot.hooks.coordinate_spec" name="hook_coordinate should not include files in the default_lang with the active_lang" file="./spec/jekyll/polyglot/hooks/coordinate_spec.rb" time="0.005212"></testcase>
<testcase classname="spec.jekyll.polyglot.hooks.coordinate_spec" name="hook_coordinate should not include files in a different lang from the active_lang" file="./spec/jekyll/polyglot/hooks/coordinate_spec.rb" time="0.005858"></testcase>
<testcase classname="spec.jekyll.polyglot.hooks.coordinate_spec" name="hook_coordinate should not be included if the active_lang is not part of the lang-exclusive" file="./spec/jekyll/polyglot/hooks/coordinate_spec.rb" time="0.008815"></testcase>
<testcase classname="spec.jekyll.polyglot.patches.jekyll.site_spec" name="Jekyll::Site must match common default urls made by jekyll" file="./spec/jekyll/polyglot/patches/jekyll/site_spec.rb" time="0.001359"></testcase>
<testcase classname="spec.jekyll.polyglot.patches.jekyll.site_spec" name="Jekyll::Site expect not match natural unfortunate urls" file="./spec/jekyll/polyglot/patches/jekyll/site_spec.rb" time="0.000650"></testcase>
<testcase classname="spec.jekyll.polyglot.patches.jekyll.site_spec" name="Jekyll::Site should default to true if parallel_localization if not set" file="./spec/jekyll/polyglot/patches/jekyll/site_spec.rb" time="0.000583"></testcase>
<testcase classname="spec.jekyll.polyglot.patches.jekyll.site_spec" name="Jekyll::Site should be false if explicitly set" file="./spec/jekyll/polyglot/patches/jekyll/site_spec.rb" time="0.000648"></testcase>
<testcase classname="spec.jekyll.polyglot.patches.jekyll.site_spec" name="Jekyll::Site must match certain strings with any simple baseurl" file="./spec/jekyll/polyglot/patches/jekyll/site_spec.rb" time="0.000803"></testcase>
<testcase classname="spec.jekyll.polyglot.patches.jekyll.site_spec" name="Jekyll::Site must match with an empty baseurl" file="./spec/jekyll/polyglot/patches/jekyll/site_spec.rb" time="0.000755"></testcase>
<testcase classname="spec.jekyll.polyglot.patches.jekyll.site_spec" name="Jekyll::Site must not match external urls" file="./spec/jekyll/polyglot/patches/jekyll/site_spec.rb" time="0.000650"></testcase>
<testcase classname="spec.jekyll.polyglot.patches.jekyll.site_spec" name="Jekyll::Site must not match excluded urls" file="./spec/jekyll/polyglot/patches/jekyll/site_spec.rb" time="0.000701"></testcase>
<testcase classname="spec.jekyll.polyglot.patches.jekyll.site_spec" name="Jekyll::Site must not match excluded urls with a set baseurl" file="./spec/jekyll/polyglot/patches/jekyll/site_spec.rb" time="0.000784"></testcase>
<testcase classname="spec.jekyll.polyglot.patches.jekyll.site_spec" name="Jekyll::Site must not match localized urls" file="./spec/jekyll/polyglot/patches/jekyll/site_spec.rb" time="0.000858"></testcase>
<testcase classname="spec.jekyll.polyglot.patches.jekyll.site_spec" name="Jekyll::Site must not match localized urls with a set baseurl" file="./spec/jekyll/polyglot/patches/jekyll/site_spec.rb" time="0.001057"></testcase>
<testcase classname="spec.jekyll.polyglot.patches.jekyll.site_spec" name="Jekyll::Site disabled relativization must match ferh relative url with baseurl" file="./spec/jekyll/polyglot/patches/jekyll/site_spec.rb" time="0.000807"></testcase>
<testcase classname="spec.jekyll.polyglot.patches.jekyll.site_spec" name="Jekyll::Site must match absolute url" file="./spec/jekyll/polyglot/patches/jekyll/site_spec.rb" time="0.000868"></testcase>
<testcase classname="spec.jekyll.polyglot.patches.jekyll.site_spec" name="Jekyll::Site must match absolute url" file="./spec/jekyll/polyglot/patches/jekyll/site_spec.rb" time="0.000807"></testcase>
<testcase classname="spec.jekyll.polyglot.patches.jekyll.site_spec" name="Jekyll::Site must not match absolute url for another project" file="./spec/jekyll/polyglot/patches/jekyll/site_spec.rb" time="0.000695"></testcase>
<testcase classname="spec.jekyll.polyglot.patches.jekyll.site_spec" name="Jekyll::Site must not match whitespaced urls" file="./spec/jekyll/polyglot/patches/jekyll/site_spec.rb" time="0.000857"></testcase>
<testcase classname="spec.jekyll.polyglot.patches.jekyll.site_spec" name="Jekyll::Site must match absolute url with baseurl" file="./spec/jekyll/polyglot/patches/jekyll/site_spec.rb" time="0.000980"></testcase>
<testcase classname="spec.jekyll.polyglot.patches.jekyll.site_spec" name="Jekyll::Site disabled relativization must match ferh absolute url with baseurl" file="./spec/jekyll/polyglot/patches/jekyll/site_spec.rb" time="0.000860"></testcase>
<testcase classname="spec.jekyll.polyglot.patches.jekyll.site_spec" name="Jekyll::Site negative lookbehind for hreflang, which god help me if this severely hampers performance" file="./spec/jekyll/polyglot/patches/jekyll/site_spec.rb" time="0.001020"></testcase>
<testcase classname="spec.jekyll.polyglot.patches.jekyll.site_spec" name="Jekyll::Site should copy active_lang to additional variables" file="./spec/jekyll/polyglot/patches/jekyll/site_spec.rb" time="0.000859"></testcase>
</testsuite>
2 changes: 1 addition & 1 deletion site/_config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ description:
ru: Плагин поддержки i18n для <a href="http://jekyllrb.com" target="_blank">Jekyll</a> что делает поддержку нескольких языков быстрой и интуитивно понятной, для больших и маленьких блогов. Сделано в <a href="https://github.com/untra" target="_blank">@untra</a>.
de: Ein sprachunterstützung plugin für <a href="http://jekyllrb.com" target="_blank">Jekyll</a>, die Unterstützung der Internationalisierung schnell und intuitiv macht, für Blogs groß und klein. Hergestellt von <a href="https://github.com/untra" target="_blank">@untra</a>.
es: Un plugin soporte de i18n para <a href="http://jekyllrb.com" target="_blank">Jekyll</a> que hace soporte de internacionalización rápida e intuitiva, para los blogs grandes y pequeños. Hecho por <a href="https://github.com/untra" target="_blank">@untra</a>.
fr: Un plugin de support de i18n pour <a href="http://jekyllrb.com" target="_blank">Jekyll</a> qui fait support de l'internationalisation rapide et intuitive, pour les blogs grands et petits. Réalisé par <a href="https://github.com/untra" target="_blank">@untra</a>.
fr: Un plugin de support de i18n pour <a href="http://jekyllrb.com" target="_blank">Jekyll</a> qui fait support de l'internationalisation rapide et intuitive, pour tous les blogs. Réalisé par <a href="https://github.com/untra" target="_blank">@untra</a>.
en: A i18n support plugin for <a href="http://jekyllrb.com" target="_blank">Jekyll</a> that makes multi-language support fast and intuitive, for blogs big and small. Made by <a href="https://github.com/untra" target="_blank">@untra</a>.

url: https://polyglot.untra.io
Expand Down
5 changes: 3 additions & 2 deletions site/_includes/sidebar.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,11 @@ <h1>

<a class="sidebar-nav-item" href="https://rubygems.org/gems/jekyll-polyglot">Ruby Gem</a>
<a class="sidebar-nav-item" href="{{ site.github.repo }}">GitHub project</a>
<span class="sidebar-nav-item">Currently v{{ site.version }}</span>
<a class="sidebar-nav-item" href="{{ site.github.repo }}/tree/master/site/{{ page.path }}"><small>view this page source on github</small></a>
<small class="sidebar-nav-item">Currently v{{ site.version }}</small>
</nav>

<p>&copy; {{ site.time | date: '%Y' }} Samuel Volin<br/>MIT Licensed</p>
<p><small>&copy; {{ site.time | date: '%Y' }} Samuel Volin</small><br/><small>MIT Licensed</small></p>
<p>
<!-- jekyll-polyglot will process ferh= into href= through the static_href liquid block tag without relativizing the url; useful for making language navigation switchers -->
{% for tongue in site.languages %}
Expand Down

0 comments on commit da2a900

Please sign in to comment.