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.

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

Switch to git subtree #5647

Merged
merged 7 commits into from
Nov 20, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 1 addition & 1 deletion .github/workflows/deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
uses: actions/checkout@v1
with:
depth: 1
submodules: true
submodules: false
- name: Extract branch name
shell: bash
run: |
Expand Down
25 changes: 25 additions & 0 deletions .github/workflows/refresh-csl-subtrees.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: Refresh Citation Style Language Files

on:
schedule:
# run on 1th and 15th of each month
- cron: '1 2 1,15 * *'

jobs:
publish:
name: Refresh Citation Style Language Files
runs-on: ubuntu-latest
steps:
- name: Checkout source
uses: actions/checkout@v1
- name: Add csl-styles remote
run: git remote add -f csl-styles https://github.com/citation-style-language/styles.git
- name: Update csl-styles
run: git subtree pull --prefix src/main/resources/csl-styles csl-styles master --squash
- name: Add csl-locales remote
run: git remote add -f csl-locales https://github.com/citation-style-language/locales.git
- name: Update csl-locales
run: git subtree pull --prefix src/main/resources/csl-locales csl-locales master --squash
- uses: ad-m/github-push-action@master
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
6 changes: 0 additions & 6 deletions .gitmodules

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public void execute() {
Globals.prefs.getBoolean(JabRefPreferences.ENFORCE_LEGAL_BIBTEX_KEY),
Globals.prefs.getBoolean(JabRefPreferences.ALLOW_INTEGER_EDITION_BIBTEX));

Task<List<IntegrityMessage>> task = new Task<List<IntegrityMessage>>() {
Task<List<IntegrityMessage>> task = new Task<>() {
@Override
protected List<IntegrityMessage> call() {
List<IntegrityMessage> result = new ArrayList<>();
Expand Down
1 change: 0 additions & 1 deletion src/main/resources/csl-locales
Submodule csl-locales deleted from 9785a6
13 changes: 13 additions & 0 deletions src/main/resources/csl-locales/.github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
## CSL Locales Pull Request Template

You're about to create a pull request to the CSL locales repository.
If you haven't done so already, see http://docs.citationstyles.org/en/stable/translating-locale-files.html for instructions on how to translate CSL locale files, and https://github.com/citation-style-language/styles/blob/master/CONTRIBUTING.md on how to submit your changes.
In addition, please fill out the pull request template below.

### Description

Briefly describe the changes you're proposing.

### Checklist

- [ ] Check that you're listed as a `<translator>` in the `<info>` block at the beginning of the file.
5 changes: 5 additions & 0 deletions src/main/resources/csl-locales/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
.bundle
*.swp
.ruby-version
.env
spec/sheldon/travis.json
5 changes: 5 additions & 0 deletions src/main/resources/csl-locales/.rspec
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
--format Fuubar
--color
--require spec_helper.rb
--format json
--out spec/sheldon/travis.json
20 changes: 20 additions & 0 deletions src/main/resources/csl-locales/.travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
language: ruby
cache: bundler
rvm:
- 2.6.3
install:
- bundle install --jobs=3 --retry=3 --path=${BUNDLE_PATH:-vendor/bundle}
- bundle update sheldon
notifications:
email:
recipients:
- rintze.zelle@gmail.com
- karcher@u.northwestern.edu
on_success: change
on_failure: always
webhooks:
urls:
- https://shelbot.herokuapp.com/build
on_success: always
on_failure: always
on_start: never
28 changes: 28 additions & 0 deletions src/main/resources/csl-locales/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# Contributing to the CSL locale repository

We welcome contributions to the Citation Style Language (CSL) locale files in this repository.

The CSL locale files provide the standard translations for automatic localization of CSL styles.
As such, the CSL locale files should generally contain the most commonly used translations for a given locale.
Less common translations can be [provided in the individual CSL styles](http://docs.citationstyles.org/en/stable/specification.html#locale) that require them, which will overwrite the CSL locale file translations.

Because each CSL locale file offers the standard translations for all CSL styles, changes should be made conservatively and carefully.
We will often ask a second native speaker and/or past contributor to look over your proposed changes.

## Licensing and crediting

By creating a pull request, you agree to license your contributions under the [Creative Commons Attribution-ShareAlike 3.0 Unported license](http://creativecommons.org/licenses/by-sa/3.0/) license.

In addition, if you're interested in being credited, please add yourself to the locale file as translator. See the example below (both the `<email/>` and `</uri>` elements are optional):

```xml
<info>
<translator>
<name>John Doe</name>
<email>john.doe@citationstyles.org</email>
<uri>https://citationstyles.org/</uri>
</translator>
<rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
<updated>2019-01-01T12:00:00+00:00</updated>
</info>
```
9 changes: 9 additions & 0 deletions src/main/resources/csl-locales/Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
ruby '2.6.3'
source 'https://rubygems.org'

gem 'rake'
gem 'rspec'
gem 'fuubar'
gem 'nokogiri'
gem 'csl', '~>1.1'
gem 'sheldon', git: 'https://github.com/citation-style-language/Sheldon.git'
70 changes: 70 additions & 0 deletions src/main/resources/csl-locales/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
GIT
remote: https://github.com/citation-style-language/Sheldon.git
revision: 09d0daebe0b6c76ccf9963f86e2e966b28a3ef46
specs:
sheldon (1.0.2)
citeproc-ruby
csl-styles
diffy
dotenv
nokogiri
ostruct
reverse_markdown

GEM
remote: https://rubygems.org/
specs:
citeproc (1.0.9)
namae (~> 1.0)
citeproc-ruby (1.1.10)
citeproc (~> 1.0, >= 1.0.9)
csl (~> 1.5)
csl (1.5.0)
namae (~> 1.0)
csl-styles (1.0.1.9)
csl (~> 1.0)
diff-lcs (1.3)
diffy (3.3.0)
dotenv (2.7.5)
fuubar (2.4.1)
rspec-core (~> 3.0)
ruby-progressbar (~> 1.4)
mini_portile2 (2.4.0)
namae (1.0.1)
nokogiri (1.10.4)
mini_portile2 (~> 2.4.0)
ostruct (0.1.0)
rake (13.0.0)
reverse_markdown (1.3.0)
nokogiri
rspec (3.8.0)
rspec-core (~> 3.8.0)
rspec-expectations (~> 3.8.0)
rspec-mocks (~> 3.8.0)
rspec-core (3.8.2)
rspec-support (~> 3.8.0)
rspec-expectations (3.8.4)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.8.0)
rspec-mocks (3.8.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.8.0)
rspec-support (3.8.2)
ruby-progressbar (1.10.1)

PLATFORMS
ruby

DEPENDENCIES
csl (~> 1.1)
fuubar
nokogiri
rake
rspec
sheldon!

RUBY VERSION
ruby 2.6.3p62

BUNDLED WITH
1.17.3
16 changes: 16 additions & 0 deletions src/main/resources/csl-locales/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
CSL Locales Repository
======================

[![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)

[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).

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/).
When distributing these locale files, the listings of translators in the locale metadata must be kept as is.
23 changes: 23 additions & 0 deletions src/main/resources/csl-locales/Rakefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@

require 'bundler'
begin
Bundler.setup
rescue Bundler::BundlerError => e
$stderr.puts e.message
$stderr.puts "Run `bundle install' to install missing gems"
exit e.status_code
end

if ENV['TRAVIS']
at_exit do
system('bundle exec sheldon')
end
end

require 'rspec/core'
require 'rspec/core/rake_task'
RSpec::Core::RakeTask.new(:spec) do |spec|
spec.rspec_opts = %w{ --require spec_helper.rb --format Fuubar --color --format json --out spec/sheldon/travis.json }
end

task :default => [:spec]
Loading