Skip to content

Commit

Permalink
Squashed 'buildres/csl/csl-locales/' changes from 495f888637..0cc3885f61
Browse files Browse the repository at this point in the history
0cc3885f61 Update README.md (#240)
972dc07564 Update gems and Ruby (#239)
6e236c960a copied .github/workflows/merge.yaml .github/workflows/sheldon.yaml from styles

git-subtree-dir: buildres/csl/csl-locales
git-subtree-split: 0cc3885f6100e26ac6c6d103efa6f3d7195fd21b
  • Loading branch information
github actions committed Oct 15, 2021
1 parent 04841d7 commit 8bcfdcd
Show file tree
Hide file tree
Showing 5 changed files with 49 additions and 26 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/merge.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
if: github.event_name == 'workflow_dispatch' || (github.event_name == 'push' && (steps.update.outputs.updated == 'true' || steps.update.outputs.deleted == 'true'))
uses: ruby/setup-ruby@v1
with:
ruby-version: 3.0.0
ruby-version: 3.0.2
- name: but use cache to speed that up
if: github.event_name == 'workflow_dispatch' || (github.event_name == 'push' && (steps.update.outputs.updated == 'true' || steps.update.outputs.deleted == 'true'))
uses: actions/cache@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sheldon.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 3.0.0
ruby-version: 3.0.2
- name: but use cache to speed that up
uses: actions/cache@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ruby '3.0.0'
ruby '3.0.2'
source 'https://rubygems.org'

gem 'rake'
Expand Down
46 changes: 31 additions & 15 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
GIT
remote: https://github.com/citation-style-language/Sheldon.git
revision: 38b6de75ac4dd86d6b3b47c172431e6e44f53ca0
revision: 38b1c813448737261a43060ccd3669d67dbfcad7
specs:
sheldon (1.0.30)
citeproc-ruby
Expand All @@ -24,23 +24,38 @@ GEM
public_suffix (>= 2.0.2, < 5.0)
citeproc (1.0.10)
namae (~> 1.0)
citeproc-ruby (1.1.13)
citeproc-ruby (1.1.14)
citeproc (~> 1.0, >= 1.0.9)
csl (~> 1.5)
csl (1.5.2)
csl (~> 1.6)
csl (1.6.0)
namae (~> 1.0)
csl-styles (1.0.1.10)
rexml
csl-styles (1.0.1.11)
csl (~> 1.0)
diff-lcs (1.4.4)
diffy (3.4.0)
dotenv (2.7.6)
erubis (2.7.0)
faraday (1.3.0)
faraday (1.8.0)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
faraday-excon (~> 1.1)
faraday-httpclient (~> 1.0.1)
faraday-net_http (~> 1.0)
faraday-net_http_persistent (~> 1.1)
faraday-patron (~> 1.0)
faraday-rack (~> 1.0)
multipart-post (>= 1.2, < 3)
ruby2_keywords
ruby2_keywords (>= 0.0.4)
faraday-em_http (1.0.0)
faraday-em_synchrony (1.0.0)
faraday-excon (1.1.0)
faraday-httpclient (1.0.1)
faraday-net_http (1.0.1)
faraday_middleware (1.0.0)
faraday-net_http_persistent (1.2.0)
faraday-patron (1.0.0)
faraday-rack (1.0.0)
faraday_middleware (1.1.0)
faraday (~> 1.0)
fuubar (2.5.1)
rspec-core (~> 3.0)
Expand All @@ -49,19 +64,20 @@ GEM
hashdiff (0.3.7)
mini_portile2 (2.6.1)
multipart-post (2.1.1)
namae (1.0.2)
namae (1.1.1)
nokogiri (1.12.5)
mini_portile2 (~> 2.6.1)
racc (~> 1.4)
octokit (4.20.0)
octokit (4.21.0)
faraday (>= 0.9)
sawyer (~> 0.8.0, >= 0.5.3)
ostruct (0.3.3)
ostruct (0.4.0)
public_suffix (4.0.6)
racc (1.5.2)
rake (13.0.3)
rake (13.0.6)
reverse_markdown (2.0.0)
nokogiri
rexml (3.2.5)
rspec (3.10.0)
rspec-core (~> 3.10.0)
rspec-expectations (~> 3.10.0)
Expand All @@ -76,7 +92,7 @@ GEM
rspec-support (~> 3.10.0)
rspec-support (3.10.2)
ruby-progressbar (1.11.0)
ruby2_keywords (0.0.4)
ruby2_keywords (0.0.5)
sawyer (0.8.2)
addressable (>= 2.3.5)
faraday (> 0.8, < 2.0)
Expand All @@ -93,7 +109,7 @@ DEPENDENCIES
sheldon!

RUBY VERSION
ruby 3.0.0p0
ruby 3.0.2p107

BUNDLED WITH
2.2.3
2.2.22
23 changes: 15 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,23 @@
CSL Locales Repository
======================
<p align="center"><a href="https://citationstyles.org/" target="_blank"><img width="300" src="https://raw.githubusercontent.com/citation-style-language/logo/master/assets/rgb/%C2%ABCSL%C2%BB.svg" alt="CSL logo"></a></p>

[![Build Status](https://travis-ci.org/citation-style-language/locales.svg?branch=master)](https://travis-ci.org/citation-style-language/locales)
[![license](https://img.shields.io/badge/license-CC%20BY%20SA%203.0-blue.svg)](https://github.com/citation-style-language/locales#licensing)
![languages](https://img.shields.io/badge/supported%20languages-52-orange.svg)
<h1 align="center">Citation Style Language - Locales Repository</h1>

<p align="center">
<a href="https://github.com/citation-style-language/styles#licensing"><img src="https://img.shields.io/badge/license-CC%20BY%20SA%203.0-blue.svg" alt="License"></a>
<a href="https://github.com/citation-style-language/styles/actions"><img src="https://github.com/citation-style-language/locales/workflows/Merge%20to%20release/badge.svg?event=push" alt="Build Status"></a>
<a href="https://img.shields.io/badge/supported%20languages-52-orange.svg" ><img src="https://img.shields.io/badge/supported%20languages-52-orange.svg" alt="Supported Languages"></a>
</p>


Introduction
------------

[github.com/citation-style-language/locales](https://github.com/citation-style-language/locales) is the official repository for Citation Style Language (CSL) locale files and is maintained by CSL project members.
For more information, check out [CitationStyles.org](http://citationstyles.org/) and the [repository wiki](https://github.com/citation-style-language/locales/wiki).
For more information, check out [CitationStyles.org](https://citationstyles.org/) and the [repository wiki](https://github.com/citation-style-language/locales/wiki).

Licensing
---------

All the locale files in this repository are released under the [Creative Commons Attribution-ShareAlike 3.0 Unported license](http://creativecommons.org/licenses/by-sa/3.0/).
For attribution, any software using CSL locale files from this repository must include a clear mention of the CSL project and a link to [CitationStyles.org](http://citationstyles.org/).
All the locale files in this repository are released under the [Creative Commons Attribution-ShareAlike 3.0 Unported license](https://creativecommons.org/licenses/by-sa/3.0/).
For attribution, any software using CSL locale files from this repository must include a clear mention of the CSL project and a link to [CitationStyles.org](https://citationstyles.org/).
When distributing these locale files, the listings of translators in the locale metadata must be kept as is.

0 comments on commit 8bcfdcd

Please sign in to comment.