Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
ryul1206 committed Jun 17, 2021
2 parents a7c8e4f + f681042 commit ee265ca
Show file tree
Hide file tree
Showing 16 changed files with 43 additions and 23 deletions.
13 changes: 11 additions & 2 deletions .github/workflows/python-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,10 @@
name: Upload Python Package

on:
release:
types: [published]
push:
branches:
- master
- develop

jobs:
deploy:
Expand All @@ -31,7 +33,14 @@ jobs:
pip install build setuptools twine --user
- name: Build package
run: python -m build
- name: Publish package 📦 to Test PyPI
if: ${{ !startsWith(github.ref, 'refs/tags') }}
uses: pypa/gh-action-pypi-publish@master
with:
password: ${{ secrets.TEST_PYPI_API_TOKEN }}
repository_url: https://test.pypi.org/legacy/
- name: Publish package 📦 to PyPI
if: startsWith(github.ref, 'refs/tags')
uses: pypa/gh-action-pypi-publish@master
with:
user: __token__
Expand Down
3 changes: 2 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
// show space
// "editor.renderWhitespace": "boundary",
"editor.renderWhitespace": "none",
//
//
"editor.quickSuggestions": {
"other": true,
"comments": true,
Expand All @@ -22,4 +22,5 @@
"python.linting.flake8Args": ["--max-line-length=88"],
"python.formatting.provider": "black",
"python.pythonPath": "/usr/bin/python3",
"files.eol": "\n"
}
8 changes: 7 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@ To do

- Better emoji detection (https://stackoverflow.com/questions/43146528/how-to-extract-all-the-emojis-from-text)

## [1.0.a2] - 2021-06-17

- **Fixed** - Fix 'import-im6.q16' errors caused by missing shebang.
- **Fixed** - Fix an infinite loop bug when select no in query_yes_no.

## [1.0.a1] - 2021-06-17

- **Added** - `pip install` from the Python Package Index.
Expand All @@ -42,7 +47,8 @@ To do
- **Added** - Initial python module. (`multilang_md,py`)
- **Added** - Added french translation to README and example. [PR #1](https://github.com/ryul1206/multilingual-markdown/pull/1) by [**@bkg2018**](https://github.com/bkg2018)

[unreleased]: https://github.com/ryul1206/multilingual-markdown/compare/v1.0.a1...develop
[unreleased]: https://github.com/ryul1206/multilingual-markdown/compare/v1.0.a2...develop
[1.0.a2]: https://github.com/ryul1206/multilingual-markdown/releases/tag/v1.0.a2
[1.0.a1]: https://github.com/ryul1206/multilingual-markdown/releases/tag/v1.0.a1
[0.2.0]: https://github.com/ryul1206/multilingual-markdown/releases/tag/v0.2.0
[0.1.0]: https://github.com/ryul1206/multilingual-markdown/releases/tag/v0.1.0
2 changes: 1 addition & 1 deletion README.base.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Ce package fournit une interface de ligne de commande pour gérer les contenus m
![GitHub](https://img.shields.io/github/license/ryul1206/multilingual-markdown.svg)
[![CodeFactor](https://www.codefactor.io/repository/github/ryul1206/multilingual-markdown/badge/master)](https://www.codefactor.io/repository/github/ryul1206/multilingual-markdown/overview/master)

🚀 **version 1.0-alpha.1** 🌏
🚀 **version 1.0-alpha.2** 🌏
[English](https://github.com/ryul1206/multilingual-markdown/blob/master/README.md),
[Français](https://github.com/ryul1206/multilingual-markdown/blob/master/README.fr.md),
[한국어](https://github.com/ryul1206/multilingual-markdown/blob/master/README.kr.md)
Expand Down
2 changes: 1 addition & 1 deletion README.fr.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Ce package fournit une interface de ligne de commande pour gérer les contenus m
![GitHub](https://img.shields.io/github/license/ryul1206/multilingual-markdown.svg)
[![CodeFactor](https://www.codefactor.io/repository/github/ryul1206/multilingual-markdown/badge/master)](https://www.codefactor.io/repository/github/ryul1206/multilingual-markdown/overview/master)

🚀 **version 1.0-alpha.1** 🌏
🚀 **version 1.0-alpha.2** 🌏
[English](https://github.com/ryul1206/multilingual-markdown/blob/master/README.md),
[Français](https://github.com/ryul1206/multilingual-markdown/blob/master/README.fr.md),
[한국어](https://github.com/ryul1206/multilingual-markdown/blob/master/README.kr.md)
Expand Down
2 changes: 1 addition & 1 deletion README.kr.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
![GitHub](https://img.shields.io/github/license/ryul1206/multilingual-markdown.svg)
[![CodeFactor](https://www.codefactor.io/repository/github/ryul1206/multilingual-markdown/badge/master)](https://www.codefactor.io/repository/github/ryul1206/multilingual-markdown/overview/master)

🚀 **version 1.0-alpha.1** 🌏
🚀 **version 1.0-alpha.2** 🌏
[English](https://github.com/ryul1206/multilingual-markdown/blob/master/README.md),
[Français](https://github.com/ryul1206/multilingual-markdown/blob/master/README.fr.md),
[한국어](https://github.com/ryul1206/multilingual-markdown/blob/master/README.kr.md)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ This package provides a command-line interface to manage multilingual contents a
![GitHub](https://img.shields.io/github/license/ryul1206/multilingual-markdown.svg)
[![CodeFactor](https://www.codefactor.io/repository/github/ryul1206/multilingual-markdown/badge/master)](https://www.codefactor.io/repository/github/ryul1206/multilingual-markdown/overview/master)

🚀 **version 1.0-alpha.1** 🌏
🚀 **version 1.0-alpha.2** 🌏
[English](https://github.com/ryul1206/multilingual-markdown/blob/master/README.md),
[Français](https://github.com/ryul1206/multilingual-markdown/blob/master/README.fr.md),
[한국어](https://github.com/ryul1206/multilingual-markdown/blob/master/README.kr.md)
Expand Down
18 changes: 11 additions & 7 deletions bin/mmg
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
import sys
import mmgcli

#!/usr/bin/env python3
# -*- coding: utf-8 -*-

def main():
return mmgcli.cli.main()
import sys
import click
from mmgcli import cli


if __name__ == '__main__':
sys.exit(main())
if __name__ == "__main__":
assert sys.version_info[0] == 3
try:
cli.main()
except Exception as e:
click.echo(e)
2 changes: 1 addition & 1 deletion example/example.base.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
![GitHub code size in bytes](https://img.shields.io/github/languages/code-size/ryul1206/multilingual-markdown.svg)
![GitHub](https://img.shields.io/github/license/ryul1206/multilingual-markdown.svg)

[English](example.en-US.md),
[English](example.md),
[Français](example.fr-FR.md),
[한국어](example.ko-KR.md),
[日本語](example.ja-JP.md)
Expand Down
2 changes: 1 addition & 1 deletion example/example.fr-FR.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
![GitHub code size in bytes](https://img.shields.io/github/languages/code-size/ryul1206/multilingual-markdown.svg)
![GitHub](https://img.shields.io/github/license/ryul1206/multilingual-markdown.svg)

[English](example.en-US.md),
[English](example.md),
[Français](example.fr-FR.md),
[한국어](example.ko-KR.md),
[日本語](example.ja-JP.md)
Expand Down
2 changes: 1 addition & 1 deletion example/example.ja-JP.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
![GitHub code size in bytes](https://img.shields.io/github/languages/code-size/ryul1206/multilingual-markdown.svg)
![GitHub](https://img.shields.io/github/license/ryul1206/multilingual-markdown.svg)

[English](example.en-US.md),
[English](example.md),
[Français](example.fr-FR.md),
[한국어](example.ko-KR.md),
[日本語](example.ja-JP.md)
Expand Down
2 changes: 1 addition & 1 deletion example/example.ko-KR.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
![GitHub code size in bytes](https://img.shields.io/github/languages/code-size/ryul1206/multilingual-markdown.svg)
![GitHub](https://img.shields.io/github/license/ryul1206/multilingual-markdown.svg)

[English](example.en-US.md),
[English](example.md),
[Français](example.fr-FR.md),
[한국어](example.ko-KR.md),
[日本語](example.ja-JP.md)
Expand Down
2 changes: 1 addition & 1 deletion example/example.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
![GitHub code size in bytes](https://img.shields.io/github/languages/code-size/ryul1206/multilingual-markdown.svg)
![GitHub](https://img.shields.io/github/license/ryul1206/multilingual-markdown.svg)

[English](example.en-US.md),
[English](example.md),
[Français](example.fr-FR.md),
[한국어](example.ko-KR.md),
[日本語](example.ja-JP.md)
Expand Down
2 changes: 1 addition & 1 deletion mmgcli/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env python3
# -*- coding: utf-8 -*-

__version__ = "1.0.a1"
__version__ = "1.0.a2"

from .cli import main
2 changes: 1 addition & 1 deletion mmgcli/base_parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ def _evaluation(keyword, line_number):
color = "bright_red" if missing else "bright_green"
message = ""
if verbosity > 0:
message = f"\t[X] {missing} language(s) not translated.\n\t " if missing else "\t[O] "
message = f"\t {missing} language(s) not translated.\n\t " if missing else "\t "
message += f"Tag count: {str(suffix_counter)}"
message += buffer
return message, color
Expand Down
2 changes: 1 addition & 1 deletion mmgcli/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def query_yes_no(question):
prompt = " [y/N] "

resp = None
while not resp:
while resp is None:
sys.stdout.write(question + prompt)
choice = input().lower()
if choice == "":
Expand Down

0 comments on commit ee265ca

Please sign in to comment.