Skip to content
This repository was archived by the owner on Jun 28, 2021. It is now read-only.

Fixes #595, #601 Add translations for settings in sidebar #602

Merged
mmahalwy merged 14 commits into from
Jan 20, 2017
+30 −21
Merged

Fixes #595, #601 Add translations for settings in sidebar #602

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
ee5ae05
Add translations for settings in sidebar
umairidris Jan 20, 2017
b0be20a
new line
umairidris Jan 20, 2017
2a3de9c
More translations
umairidris Jan 20, 2017
575f89a
Periods
umairidris Jan 20, 2017
145446f
Rename settings ids
umairidris Jan 20, 2017
03b8768
Use existing ids which I blindly missed
umairidris Jan 20, 2017
29bfc21
Delete ids from ur.js
umairidris Jan 20, 2017
4ae39ce
Delete ids from en.js
umairidris Jan 20, 2017
58d1906
Fix reciters title for ur/ar
umairidris Jan 20, 2017
aa1c990
Use setting.title
umairidris Jan 20, 2017
3a3ebb7
I should get some sleep
umairidris Jan 20, 2017
c446279
Revert setting.title to nav.settings
umairidris Jan 20, 2017
b406cdf
Remove setting.option, add nav.title
umairidris Jan 20, 2017
cb3152b
Merge branch 'master' into settingstranslations
naveed-ahmad Jan 20, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 3 additions & 8 deletions src/components/Footer/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,13 +135,6 @@ const Footer = () => (
</Col>

<Col md={4} sm={12} xs={12} className={styles.links}>
<p className={styles.header}>
<LocaleFormattedMessage
id="local.selectLabel"
defaultMessage="Site Language"
/>
</p>

<div className={styles.list}>
<p className="monserrat">
<LocaleFormattedMessage
Expand All @@ -150,7 +143,9 @@ const Footer = () => (
/>
</p>

<p className="monserrat">&copy; QURAN.COM. ALL RIGHTS RESERVED 2016</p>
<p className="monserrat">
&copy; 2016 Quran.com. <LocaleFormattedMessage id="nav.rightsReserved" defaultMessage="All Rights Reserved" />.
</p>
</div>
</Col>
</div>
Expand Down
5 changes: 3 additions & 2 deletions src/components/GlobalSidebar/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,15 +56,16 @@ class GlobalSidebar extends Component {
className="navbar-text"
onClick={() => handleOpen(false)}
>
<LocaleFormattedMessage id="setting.title" defaultMessage="Quran" />
<LocaleFormattedMessage id="nav.title" defaultMessage="Quran" />
</p>
</NavbarHeader>
</Navbar>
<ul className={styles.list}>
{children}
<li>
<a tabIndex="-1" className="pointer" onClick={() => this.setState({ settingsModalOpen: true }, handleOpen(false))}>
<i className="ss-icon ss-settings vertical-align-middle" />{' '}Settings
<i className="ss-icon ss-settings vertical-align-middle" />{' '}
<LocaleFormattedMessage id="nav.settings" defaultMessage="Settings" />
Copy link
Contributor

@naveed-ahmad naveed-ahmad Jan 20, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we can use setting.title for this, no need to duplicate keys with same values.

Copy link
Contributor Author

@umairidris umairidris Jan 20, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

Copy link
Contributor Author

@umairidris umairidris Jan 20, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wait.. setting.title is set to Quran for some reason

Copy link
Contributor Author

@umairidris umairidris Jan 20, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

setting.title is the sidebar title not the "settings" word

Copy link
Contributor Author

@umairidris umairidris Jan 20, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I actually searched for options for urdu/arabic to be safe (so it duplicates setting.option at the moment) because settings in english has two meanings. But in English it should be called settings, not options. If you have alternative word for settings for urdu I can use that instead.

Copy link
Contributor

@naveed-ahmad naveed-ahmad Jan 20, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe we had 'Setting' and 'options' two different words in sidebar before. But that's not the case now. We can remove options now.

Copy link
Contributor

@naveed-ahmad naveed-ahmad Jan 20, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

value of setting.title should be "Settings", that's bug in en.js. Urdu and Arabic has correct value. Lets use setting.title and remove setting.options

Copy link
Contributor Author

@umairidris umairidris Jan 20, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done. Drawer was using setting.title so I added a nav.title to replace it.

</a>
</li>
<li>
Expand Down
15 changes: 11 additions & 4 deletions src/components/SettingsModal/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import React, { PropTypes } from 'react';
import { connect } from 'react-redux';
import Modal from 'react-bootstrap/lib/Modal';

import LocaleFormattedMessage from 'components/LocaleFormattedMessage';
import ReciterDropdown from 'components/ReciterDropdown';
import ContentDropdown from 'components/ContentDropdown';
import TooltipDropdown from 'components/TooltipDropdown';
Expand Down Expand Up @@ -37,26 +38,32 @@ const SettingsModal = ({
<Modal show={open} onHide={handleHide}>
<ModalHeader closeButton>
<ModalTitle className="montserrat">
Settings
<LocaleFormattedMessage id="setting.title" defaultMessage="Settings" />
</ModalTitle>
</ModalHeader>
<ModalBody>
<div className="form-group">
<h5 className="text-black">Reciters</h5>
<h5 className="text-black">
<LocaleFormattedMessage id="setting.reciters.title" defaultMessage="Reciters" />
</h5>
<ReciterDropdown
onOptionChange={handleOptionChange}
audio={options.audio}
/>
</div>
<div className="form-group">
<h5 className="text-black">Translations</h5>
<h5 className="text-black">
<LocaleFormattedMessage id="setting.translations.title" defaultMessage="Translations" />
</h5>
<ContentDropdown
onOptionChange={handleOptionChange}
content={options.content}
/>
</div>
<div className="form-group">
<h5 className="text-black">Tooltip Content</h5>
<h5 className="text-black">
<LocaleFormattedMessage id="setting.tooltip.title" defaultMessage="Tooltip Content" />
</h5>
<TooltipDropdown
tooltip={options.tooltip}
onOptionChange={setOption}
Expand Down
6 changes: 4 additions & 2 deletions src/locale/ar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,10 @@ export default {
'local.changeLocal': 'اختر اللغة التي تود عرض الموقع بها',
'local.navtiveName': 'العربية',
'local.selectLabel': 'اللغة',
'setting.options': 'خيارات',
'setting.title': 'خيارات',
'setting.surahs': 'السورة',
'setting.verses': 'الذهاب إلى الآية',
'setting.reciters': 'القراء',
'setting.reciters.title': 'القراء',
'setting.translations.title': 'الترجمات',
'setting.translations.removeAll': 'حذف الكل',
'setting.translations.english': 'الإنجليزية',
Expand Down Expand Up @@ -61,6 +60,8 @@ export default {
'actions.play': 'لعب',
'actions.pause': 'وقفة',

'nav.title': 'القرآن',
'nav.settings': 'خيارات',
'nav.contribute': 'يساهم',
'nav.aboutUs': 'معلومات عنا',
'nav.developers': 'المطورين',
Expand All @@ -69,6 +70,7 @@ export default {
'nav.contactUs': 'اتصل بنا',
'nav.help': 'مساعدة وتعليقات',
'nav.aboutQuranProject': 'Quran.com المعروف أيضا باسم القرآن الكريم، قناة القرآن الكريم، القرآن الكريم، القرآن الكريم) هو مشروع خيري)', // eslint-disable-line max-len
'nav.rightsReserved': 'كل الحقوق محفوظة',
'nav.mobile': 'التليفون المحمول',
'nav.navigate': 'انتقل',
'nav.legacySite': 'الموقع القديم',
Expand Down
8 changes: 5 additions & 3 deletions src/locale/en.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,10 @@ export default {
'local.changeLocal': 'Choose the language you want the site to display with',
'local.navtiveName': 'English',
'local.selectLabel': 'Language',
'setting.options': 'Options',
'setting.title': 'Quran',
'setting.title': 'Settings',
'setting.surahs': 'Surahs',
'setting.verses': 'Go to verse',
'setting.reciters': 'Reciters',
'setting.reciters.title': 'Reciters',
'setting.translations.title': 'Translations',
'setting.translations.removeAll': 'Remove all',
'setting.translations.english': 'English',
Expand Down Expand Up @@ -61,6 +60,8 @@ export default {
'actions.play': 'Play',
'actions.pause': 'Pause',

'nav.title': 'Quran',
'nav.settings': 'Settings',
'nav.contribute': 'Contribute',
'nav.aboutUs': 'About us',
'nav.developers': 'Developers',
Expand All @@ -69,6 +70,7 @@ export default {
'nav.contactUs': 'Contact us',
'nav.help': 'Help & feedback',
'nav.aboutQuranProject': 'Quran.com (also known as The Noble Quran, Al Quran, Holy Quran, Koran) is a pro bono project.', // eslint-disable-line max-len
'nav.rightsReserved': 'All Rights Reserved',
'nav.mobile': 'Mobile Apps',
'nav.navigate': 'Navigate',
'nav.legacySite': 'Legacy Quran.com',
Expand Down
6 changes: 4 additions & 2 deletions src/locale/ur.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,10 @@ export default {
'local.changeLocal': 'جس زبان میں سایٹ دیکہنا چاہتے ہیں اس زبان کا انتخاب کریں',
'local.navtiveName': 'اردو',
'local.selectLabel': 'زبان',
'setting.options': 'اختیارات',
'setting.title': 'اختیارات',
'setting.surahs': 'سورة',
'setting.verses': 'آیت منتخب کریں',
'setting.reciters': 'قاری منتخب کریں',
'setting.reciters.title': 'قاری منتخب کریں',
'setting.translations.title': 'ترجمے',
'setting.translations.removeAll': 'سب کو ہٹا دیں',
'setting.translations.english': 'انگریزی',
Expand Down Expand Up @@ -61,6 +60,8 @@ export default {
'actions.play': 'چلاو',
'actions.pause': 'روک دیں',

'nav.title': 'قرآن',
'nav.settings': 'اختیارات',
'nav.contribute': 'تعاون کریں',
'nav.aboutUs': 'ہمارے متعلق',
'nav.developers': 'ڈویلپرز',
Expand All @@ -69,6 +70,7 @@ export default {
'nav.contactUs': 'ہم سے رابطہ',
'nav.help': 'مدد اور تاثرات',
'nav.aboutQuranProject': 'قرآن کریم ایک فلاں عامہ (عوامی بہبود کے لئے) منصوبہ ہے',
'nav.rightsReserved': 'جملہ حقوق محفوظ ہیں',
'nav.mobile': 'موبائل',
'nav.navigate': 'تشریف لے جائیں',
'nav.legacySite': 'پرانی سائٹ',
Expand Down