Skip to content

Commit

Permalink
Merge branch 'develop' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
jayehernandez authored May 18, 2020
2 parents a54717a + b014dd7 commit 59459a5
Show file tree
Hide file tree
Showing 4 changed files with 76 additions and 3 deletions.
20 changes: 19 additions & 1 deletion .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,25 @@
"avatar_url": "https://avatars1.githubusercontent.com/u/12575688?v=4",
"profile": "https://github.com/michieriffic",
"contributions": [
"code"
"content"
]
},
{
"login": "fluorspar20",
"name": "Amogh Dixit",
"avatar_url": "https://avatars0.githubusercontent.com/u/59736770?v=4",
"profile": "https://github.com/fluorspar20",
"contributions": [
"content"
]
},
{
"login": "paulzay",
"name": "Paul Ogolla",
"avatar_url": "https://avatars3.githubusercontent.com/u/29974825?v=4",
"profile": "https://github.com/paulzay",
"contributions": [
"content"
]
}
],
Expand Down
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
![Title](docs/screenshots/title.png)

<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
[![All Contributors](https://img.shields.io/badge/all_contributors-2-orange.svg?style=flat-square)](#contributors-)
[![All Contributors](https://img.shields.io/badge/all_contributors-3-orange.svg?style=flat-square)](#contributors-)
<!-- ALL-CONTRIBUTORS-BADGE:END -->

<p>
Expand Down Expand Up @@ -80,8 +80,10 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
<!-- markdownlint-disable -->
<table>
<tr>
<td align="center"><a href="https://about.me/vaibhav_khulbe"><img src="https://avatars0.githubusercontent.com/u/11731837?v=4" width="100px;" alt=""/><br /><sub><b>Vaibhav Khulbe</b></sub></a><br /><a href="https://github.com/jayehernandez/letra-extension/commits?author=Kvaibhav01" title="Code">💻</a><a href="#content-Kvaibhav01" title="Content">🖋</a></td>
<td align="center"><a href="https://about.me/vaibhav_khulbe"><img src="https://avatars0.githubusercontent.com/u/11731837?v=4" width="100px;" alt=""/><br /><sub><b>Vaibhav Khulbe</b></sub></a><br /><a href="https://github.com/jayehernandez/letra-extension/commits?author=Kvaibhav01" title="Code">💻</a><a href="https://github.com/jayehernandez/letra-extension/commits?author=Kvaibhav01" title="Content">🖋</a></td>
<td align="center"><a href="https://github.com/michieriffic"><img src="https://avatars1.githubusercontent.com/u/12575688?v=4" width="100px;" alt=""/><br /><sub><b>michieriffic</b></sub></a><br /><a href="https://github.com/jayehernandez/letra-extension/commits?author=michieriffic" title="Content">🖋</a></td>
<td align="center"><a href="https://github.com/fluorspar20"><img src="https://avatars0.githubusercontent.com/u/59736770?v=4" width="100px;" alt=""/><br /><sub><b>Amogh Dixit</b></sub></a><br /><a href="https://github.com/jayehernandez/letra-extension/commits?author=fluorspar20" title="Content">🖋</a></td>
<td align="center"><a href="https://github.com/paulzay"><img src="https://avatars3.githubusercontent.com/u/29974825?v=4" width="100px;" alt=""/><br /><sub><b>Paul Ogolla</b></sub></a><br /><a href="https://github.com/jayehernandez/letra-extension/commits?author=paulzay" title="Content">🖋</a></td>
</tr>
</table>

Expand Down
1 change: 1 addition & 0 deletions docs/new_quote.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,6 @@ Here's a small checklist to make sure your Pull Request is accepted!

## ✅ Checklist
- [ ] The quote(s) added are not ❌ duplicates.
- [ ] The quote(s) added are about **learning a foreign language**.
- [ ] The sentence attribute does not have inner quotation marks, and is ended with a period.
- [ ] Copy pasted the raw JSON `quotes.json` file to [JSONLint](https://jsonlint.com/) and made sure that the modified JSON file is valid.
52 changes: 52 additions & 0 deletions server/data/quotes.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,48 @@
[
{
"sentence": "Language comes first. It’s not that language grows out of consciousness, if you haven’t got language, you can’t be conscious.",
"author": "Alan Moore"
},
{
"sentence": "Learn a language, and you’ll avoid a war.",
"author": "Arab Proverb"
},
{
"sentence": "I love commuting between languages just like I love commuting between cultures and cities.",
"author": "Elif Safak"
},
{
"sentence": "A man who knows two languages is worth two men.",
"author": "French Proverb"
},
{
"sentence": "A language is an exact reflection of the character and growth of its speakers.",
"author": "Cesar Chavez"
},
{
"sentence": "Language is the road map of a culture. It tells you where its people come from and where they are going.",
"author": "Rita Mae Brown"
},
{
"sentence": "Those who know nothing of foreign languages know nothing of their own.",
"author": "Johann Wolfgang von Goethe"
},
{
"sentence": "If you talk to a man in a language he understands, that goes to his head. If you talk to him in his language, that goes to his heart.",
"author": "Nelson Mandela"
},
{
"sentence": "The more languages you know, the more you are human.",
"author": "Tomáš Garrigue Masaryk"
},
{
"sentence": "Language exerts hidden power, like a moon on the tides.",
"author": "Rita Mae Brown"
},
{
"sentence": "Knowledge of languages is the doorway to wisdom.",
"author": "Roger Bacon"
},
{
"sentence": "Do you know what a foreign accent is? It’s a sign of bravery.",
"author": "Amy Chua"
Expand Down Expand Up @@ -166,5 +210,13 @@
{
"sentence": "One must not be shy where language is concerned.",
"author": "Ann Patchett"
},
{
"sentence": "Language is the apparel in which your thoughts parade before the public.",
"author": "George Crane"
},
{
"sentence": "The more languages you know, the more you are human.",
"author": " Tomáš Garrigue Masaryk"
}
]

0 comments on commit 59459a5

Please sign in to comment.