From 442029bf06e2068189b611f2d3e85ef0483c6195 Mon Sep 17 00:00:00 2001 From: Ned Zimmerman Date: Tue, 6 Mar 2018 10:10:32 -0400 Subject: [PATCH] Update version, add localization tools. --- .tx/config | 9 ++++ README.md | 15 +++++- bin/i18n.sh | 6 +++ composer.json | 2 +- package.json | 127 +++++++++++++++++++++++++------------------------- readme.txt | 14 +++++- style.css | 6 +-- 7 files changed, 107 insertions(+), 72 deletions(-) create mode 100644 .tx/config create mode 100755 bin/i18n.sh diff --git a/.tx/config b/.tx/config new file mode 100644 index 0000000..a00e10a --- /dev/null +++ b/.tx/config @@ -0,0 +1,9 @@ +[main] +host = https://www.transifex.com + +[pressbooks-aldine.pressbooks-aldine] +source_file = languages/pressbooks-aldine.pot +source_lang = en +type = PO +file_filter = languages/.po +lang_map = de:de_DE, es:es_ES, fr:fr_FR, gl:gl_ES, nb:nb_NO, it:it_IT, ka:ka_GE, ru:ru_RU, ta:ta_LK diff --git a/README.md b/README.md index 9f68ddc..edab4d2 100644 --- a/README.md +++ b/README.md @@ -6,8 +6,8 @@ **Requires at least:** 4.9.4 **Tested up to:** 4.9.4 -**Stable tag:** 1.0.0 -**License:** GNU General Public License v3 +**Stable tag:** 1.0.1 +**License:** GNU General Public License v3 or later **License URI:** LICENSE Aldine is the default theme for the home page of Pressbooks networks. It is named for the Aldine Press, founded by Aldus Manutius in 1494, who is regarded by many as the world’s first publisher. @@ -33,6 +33,17 @@ TK. ## Changelog +# Aldine 1.0.1 + +#### Patches + +- Load header image from `dist` ([#104](https://github.com/pressbooks/pressbooks-aldine/issues/104), props [@steven1350](https://github.com/steven1350) for reporting): [826dc93](https://github.com/pressbooks/pressbooks-aldine/commit/826dc930869041df0ffdd15748f686013fbed54e) +- Prevent page header from overlapping menu in some situations ([#103](https://github.com/pressbooks/pressbooks-aldine/issues/103), props [@beckej13820](https://github.com/beckej13820) for reporting): [df793ac](https://github.com/pressbooks/pressbooks-aldine/commit/df793acda9a4ccd4975056e150862e73f9e8379f) +- Improve display of pages without content ([#102](https://github.com/pressbooks/pressbooks-aldine/issues/102)): [0866e9a](https://github.com/pressbooks/pressbooks-aldine/commit/0866e9afe80f82b7d79dfd5a4d17095ee0bf716b) +- Update activation routine to use shortcodes: [1409a01](https://github.com/pressbooks/pressbooks-aldine/commit/1409a01b7759b6b4117316763957d498a5827692) +- Use a unique cookie name for the network homepage font size setting: [d109496](https://github.com/pressbooks/pressbooks-aldine/commit/d10949677ccc3fee67fbb9b1069c360b2270c779) + + # Aldine 1.0.0 #### Customisation & Branding diff --git a/bin/i18n.sh b/bin/i18n.sh new file mode 100755 index 0000000..610b044 --- /dev/null +++ b/bin/i18n.sh @@ -0,0 +1,6 @@ +#!/bin/bash +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +PARENT="$(dirname $DIR)" +tx push -s +tx pull -a +for file in $PARENT/languages/*.po ; do msgfmt $file -o `echo $file | sed 's/\(.*\.\)po/\1mo/'` ; done diff --git a/composer.json b/composer.json index 1a1b62a..f75ec62 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "name": "pressbooks/pressbooks-aldine", "type": "wordpress-theme", - "license": "GPL-3.0", + "license": "GPL-3.0-or-later", "description": "Aldine is the default theme for the home page of Pressbooks networks. It is named for the Aldine Press, founded by Aldus Manutius in 1494, who is regarded by many as the world’s first publisher.", "homepage": "https://github.com/pressbooks/pressbooks-aldine/", diff --git a/package.json b/package.json index 0879143..d20b4d8 100644 --- a/package.json +++ b/package.json @@ -1,66 +1,65 @@ { - "name": "@pressbooks/pressbooks-aldine", - "version": "1.0.0", - "author": "Pressbooks (Book Oven Inc.) ", - "homepage": "https://github.com/pressbooks/pressbooks-aldine/", - "description": "Aldine is the default theme for the home page of Pressbooks networks. It is named for the Aldine Press, founded by Aldus Manutius in 1494, who is regarded by many as the world’s first publisher.", - "keywords": [ - "publishing", - "catalog", - "pressbooks", - "default-theme" - ], - "private": true, - "repository": { - "type": "git", - "url": "git://github.com/pressbooks/pressbooks-aldine.git" - }, - "bugs": { - "url": "https://github.com/pressbooks/pressbooks-aldine/issues" - }, - "licenses": [ - { - "type": "GPL-3.0", - "url": "https://opensource.org/licenses/GPL-3.0" - } - ], - "browserslist": [ - "last 2 versions", - "android 4", - "opera 12" - ], - "eslintConfig": { - "extends": "./node_modules/pressbooks-build-tools/config/eslint.js", - "globals": { - "$": true, - "PB_A11y": true - } - }, - "stylelint": { - "extends": "./node_modules/pressbooks-build-tools/config/stylelint.js" - }, - "scripts": { - "build": "cross-env NODE_ENV=development webpack --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", - "build:production": "cross-env NODE_ENV=production webpack --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", - "build:profile": "cross-env NODE_ENV=production webpack --progress --profile --json --config=node_modules/laravel-mix/setup/webpack.config.js", - "start": "cross-env NODE_ENV=development webpack --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", - "rmdist": "rimraf dist", - "lint": "npm run -s lint:scripts && npm run -s lint:styles", - "lint:scripts": "cross-env NODE_ENV=development node_modules/eslint/bin/eslint.js \"assets/scripts/*.js\"", - "lint:styles": "cross-env NODE_ENV=development node_modules/stylelint/bin/stylelint.js \"assets/styles/**/*.scss\" --syntax scss", - "test": "npm run -s lint" - }, - "engines": { - "node": ">= 6.9.4" - }, - "devDependencies": { - "pressbooks-build-tools": "^0.11.0" - }, - "dependencies": { - "aetna": "^1.0.0-alpha.17", - "isotope-layout": "^3.0.5", - "jquery-bridget": "^2.0.1", - "js-cookie": "^2.2.0", - "wpapi": "^1.1.2" - } + "name": "@pressbooks/pressbooks-aldine", + "version": "1.0.0", + "author": "Pressbooks (Book Oven Inc.) ", + "homepage": "https://github.com/pressbooks/pressbooks-aldine/", + "description": + "Aldine is the default theme for the home page of Pressbooks networks. It is named for the Aldine Press, founded by Aldus Manutius in 1494, who is regarded by many as the world’s first publisher.", + "keywords": ["publishing", "catalog", "pressbooks", "default-theme"], + "private": true, + "repository": { + "type": "git", + "url": "git://github.com/pressbooks/pressbooks-aldine.git" + }, + "bugs": { + "url": "https://github.com/pressbooks/pressbooks-aldine/issues" + }, + "licenses": [ + { + "type": "GPL-3.0-or-later", + "url": + "https://github.com/pressbooks/pressbooks-aldine/tree/master/LICENSE.md" + } + ], + "browserslist": ["last 2 versions", "android 4", "opera 12"], + "eslintConfig": { + "extends": "./node_modules/pressbooks-build-tools/config/eslint.js", + "globals": { + "$": true, + "PB_A11y": true + } + }, + "stylelint": { + "extends": "./node_modules/pressbooks-build-tools/config/stylelint.js" + }, + "scripts": { + "build": + "cross-env NODE_ENV=development webpack --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", + "build:production": + "cross-env NODE_ENV=production webpack --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", + "build:profile": + "cross-env NODE_ENV=production webpack --progress --profile --json --config=node_modules/laravel-mix/setup/webpack.config.js", + "start": + "cross-env NODE_ENV=development webpack --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", + "rmdist": "rimraf dist", + "lint": "npm run -s lint:scripts && npm run -s lint:styles", + "lint:scripts": + "cross-env NODE_ENV=development node_modules/eslint/bin/eslint.js \"assets/scripts/*.js\"", + "lint:styles": + "cross-env NODE_ENV=development node_modules/stylelint/bin/stylelint.js \"assets/styles/**/*.scss\" --syntax scss", + "test": "npm run -s lint" + }, + "engines": { + "node": ">= 6.9.4" + }, + "devDependencies": { + "pressbooks-build-tools": "^0.11.0" + }, + "dependencies": { + "aetna": "^1.0.0-alpha.17", + "isotope-layout": "^3.0.5", + "jquery-bridget": "^2.0.1", + "js-cookie": "^2.2.0", + "wpapi": "^1.1.2" + } } diff --git a/readme.txt b/readme.txt index 76b703b..1623a1b 100644 --- a/readme.txt +++ b/readme.txt @@ -6,8 +6,8 @@ Tags: publishing, catalog, pressbooks, default-theme Requires at least: 4.9.4 Tested up to: 4.9.4 -Stable tag: 1.0.0 -License: GNU General Public License v3 +Stable tag: 1.0.1 +License: GNU General Public License v3 or later License URI: LICENSE Aldine is the default theme for the home page of Pressbooks networks. It is named for the Aldine Press, founded by Aldus Manutius in 1494, who is regarded by many as the world’s first publisher. @@ -28,6 +28,16 @@ TK. == Changelog == +=== Aldine 1.0.1 === + +#### Patches + +- Load header image from `dist` ([#104](https://github.com/pressbooks/pressbooks-aldine/issues/104), props [@steven1350](https://github.com/steven1350) for reporting): [826dc93](https://github.com/pressbooks/pressbooks-aldine/commit/826dc930869041df0ffdd15748f686013fbed54e) +- Prevent page header from overlapping menu in some situations ([#103](https://github.com/pressbooks/pressbooks-aldine/issues/103), props [@beckej13820](https://github.com/beckej13820) for reporting): [df793ac](https://github.com/pressbooks/pressbooks-aldine/commit/df793acda9a4ccd4975056e150862e73f9e8379f) +- Improve display of pages without content ([#102](https://github.com/pressbooks/pressbooks-aldine/issues/102)): [0866e9a](https://github.com/pressbooks/pressbooks-aldine/commit/0866e9afe80f82b7d79dfd5a4d17095ee0bf716b) +- Update activation routine to use shortcodes: [1409a01](https://github.com/pressbooks/pressbooks-aldine/commit/1409a01b7759b6b4117316763957d498a5827692) +- Use a unique cookie name for the network homepage font size setting: [d109496](https://github.com/pressbooks/pressbooks-aldine/commit/d10949677ccc3fee67fbb9b1069c360b2270c779) + === Aldine 1.0.0 === #### Customisation & Branding diff --git a/style.css b/style.css index 041f5cf..7008827 100644 --- a/style.css +++ b/style.css @@ -2,14 +2,14 @@ Theme Name: Aldine Theme URI: https://github.com/pressbooks/pressbooks-aldine/ Description: Aldine is the default theme for the home page of Pressbooks networks. It is named for the Aldine Press, founded by Aldus Manutius in 1494, who is regarded by many as the world’s first publisher. -Version: 1.0.0 +Version: 1.0.1 Author: Pressbooks (Book Oven Inc.) Author URI: https://pressbooks.org Text Domain: pressbooks-aldine GitHub Theme URI: pressbooks/pressbooks-aldine Release Asset: true -License: GNU General Public License v3 -License URI: http://opensource.org/licenses/GPL-3.0 +License: GNU GPL v3 or later +License URI: https://github.com/pressbooks/pressbooks-aldine/tree/master/LICENSE.md Aldine is based on Underscores https://underscores.me/, (C) 2012-2017 Automattic, Inc. Underscores is distributed under the terms of the GNU GPL v2 or later.