Merge branch 'master' into settings

This commit is contained in:
David Ralph 2019-07-06 13:52:19 +01:00 committed by GitHub
commit 5109bb725d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 61 additions and 15 deletions

33
.github/ISSUE_TEMPLATE/bug-report.md vendored Normal file
View File

@ -0,0 +1,33 @@
---
name: Bug Report
about: Report a bug to help improve this project
title: "[BUG]"
labels: bug
assignees: ''
---
**Description**
A clear and concise description of what the bug is.
**To Reproduce**
Steps to reproduce the behaviour:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error
**Expected behaviour**
A clear and concise description of what you expected to happen.
**Screenshots**
If applicable, add screenshots to help explain your problem.
**Desktop (please complete the following information):**
- OS: [e.g. Windows]
- Browser [e.g. Chrome, Firefox]
- Version [e.g. 70]
- Resolution [e.g 1920x1080]
**Additional context**
Add any other context about the problem here.

View File

@ -0,0 +1,14 @@
---
name: Feature Request
about: Suggest an idea for this project
title: "[Feature Request]"
labels: enhancement
assignees: ''
---
**Description**
A clear and concise description of what you want in this new feature.
**Additional context**
Add any other context or screenshots about the feature request here.

View File

@ -31,13 +31,12 @@ Development: Read the [Development](#development) section.
### Opera/Other
Link: [GitHub Releases](https://github.com/ohlookitsderpy/Mue/releases)
Development: Read the [Development](#development) section.
Development/Other: Read the [Development](#development) section.
### Development
<h5>Requirements</h5>
<ol>
<li>Git (optional)</li>
<li>Node.js</li>
<li><a href='https://git-scm.com'>Git</a> (optional)</li>
<li><a href='https://nodejs.org'>Node.js</a></li>
<li>A suitable browser</li>
</ol>
<h5>Starting</h5>
@ -107,7 +106,7 @@ Development: Read the [Development](#development) section.
### Translations
[ohlookitsderpy](https://github.com/ohlookitsderpy) - English (Quotes and Messages)
[Yanderella](https://github.com/Chivi19) - Italian (Quotes and Messages)
[Yanderella](https://github.com/tomiedev) - Italian (Quotes and Messages)
Pepehound - Spanish (Quotes and Messages)
@ -115,7 +114,7 @@ Candystick - Portuguese (Some Quotes)
[PassTheWessel](https://github.com/PassTheWessel) - Dutch (Messages)
[Yanderella](https://github.com/Chivi19) and [ohlookitsderpy](https://github.com/ohlookitsderpy) - French (Messages)
[Yanderella](https://github.com/tomiedev) and [ohlookitsderpy](https://github.com/ohlookitsderpy) - French (Messages)
[untocodes](https://github.com/untocodes) - Finnish and German (Messages)

View File

@ -9,9 +9,9 @@
"js-watch": "webpack --progress --watch"
},
"devDependencies": {
"eslint": "6.0.0",
"sass": "1.21.0",
"webpack": "4.35.0",
"eslint": "6.0.1",
"sass": "1.22.2",
"webpack": "4.35.2",
"webpack-cli": "3.3.4"
}
}

View File

@ -71,11 +71,11 @@ module.exports = class Func {
document.querySelector('blockquote').innerHTML = `"${data.quote}"`;
document.querySelector('cite').innerHTML = data.author;
});*/
if (util.contains.call(codes.itcodes, nal)) document.querySelector('blockquote').innerHTML = `"${quotes.it[id]}"`; // Italian
if (util.contains.call(codes.ptcodes, nal)) document.querySelector('blockquote').innerHTML = `"${quotes.pt[id]}"` || `"${quotes.eng[id]}"`; // Portuguese
if (util.contains.call(codes.spcodes, nal)) document.querySelector('blockquote').innerHTML = `"${quotes.sp[id]}"`; // Spanish
else document.querySelector('blockquote').innerHTML = `"${quotes.eng[id]}"`; // English
document.querySelector('cite').innerHTML = quotes.authors[id];
if (util.contains.call(codes.itcodes, nal)) document.querySelector('blockquote').innerHTML = `"${quotes.it[id]}"`; // Italian
if (util.contains.call(codes.ptcodes, nal)) document.querySelector('blockquote').innerHTML = `"${quotes.pt[id]}"` || `"${quotes.eng[id]}"`; // Portuguese
if (util.contains.call(codes.spcodes, nal)) document.querySelector('blockquote').innerHTML = `"${quotes.sp[id]}"`; // Spanish
else document.querySelector('blockquote').innerHTML = `"${quotes.eng[id]}"`; // English
document.querySelector('cite').innerHTML = quotes.authors[id];
}
static setTime() {
@ -89,4 +89,4 @@ module.exports = class Func {
// Example: [16, 32, 03] -> "16:32:03"
document.getElementById('withSeconds').innerHTML = time.join(':');
}
};
};