Restructure Japanese language section and add dake-vs-shika.md file.
This commit is contained in:
parent
7f100ea3d1
commit
e8ed5c6ad3
22
src/App.js
22
src/App.js
@ -36,19 +36,23 @@ import Linux from './Pages/Linux/Linux';
|
||||
import Footer from './UI/Footer';
|
||||
|
||||
import BasicPage from './Pages/BasicPage';
|
||||
import Japan from './Pages/Japan/Japan';
|
||||
import JapaneseMain from './Pages/Japan/JapaneseMain';
|
||||
|
||||
import JapanMapPage from './Pages/Japan/JapanMapPage';
|
||||
import JapanMain from './Pages/Japan/JapanMain';
|
||||
import JapanesePage from './Pages/Japan/JapanesePage';
|
||||
|
||||
import EquipmentPage from './Pages/Radio/equipmentPage';
|
||||
|
||||
import { languages, getLanguage } from './Language/Language';
|
||||
import { elmRoutes } from './Routers';
|
||||
import { elmRoutes, japaneseRoutes } from './Routers';
|
||||
|
||||
function App() {
|
||||
const language = getLanguage();
|
||||
|
||||
const paths = {
|
||||
'japan': <JapaneseMain />,
|
||||
'japanMap': <Japan />,
|
||||
'japan': <JapanMain />,
|
||||
'japan/japanese': <JapanesePage />, // Needs an md_path
|
||||
'japanMap': <JapanMapPage />,
|
||||
'radio': <RadioMain />,
|
||||
'software': <SoftwareMain />,
|
||||
};
|
||||
@ -102,11 +106,17 @@ function App() {
|
||||
<Route exact path='/en' element={<Home language={language} />}></Route>
|
||||
<Route exact path='/nl' element={<Home language={language} />}></Route>
|
||||
|
||||
{elmRoutes}
|
||||
{/* Japan */}
|
||||
{japaneseRoutes}
|
||||
|
||||
{/* Radio */}
|
||||
{componentRoutes}
|
||||
{fieldDaysRoutes}
|
||||
{equipmentRoutes}
|
||||
{generatedRoutes}
|
||||
|
||||
{/* Software */}
|
||||
{elmRoutes}
|
||||
<Route exact path='/software/dxp-development' element={<DXPDevelopment />}></Route>
|
||||
<Route exact path='/software/configuration-automation' element={<ConfigAutomation />}></Route>
|
||||
<Route exact path='/software/wifi-prototype' element={<WifiPrototype />}></Route>
|
||||
|
||||
@ -9,6 +9,7 @@ const languageStrings = {
|
||||
on: 'on',
|
||||
name: 'name',
|
||||
// Titles
|
||||
japan: 'Japan',
|
||||
japanese: 'Japanese',
|
||||
radio_amateur: 'Radio amateur',
|
||||
software: 'Software',
|
||||
@ -47,6 +48,7 @@ const languageStrings = {
|
||||
on: 'op',
|
||||
name: 'naam',
|
||||
// Titles
|
||||
japan: 'Japan',
|
||||
japanese: 'Japans',
|
||||
radio_amateur: 'Radiozendamateur',
|
||||
software: 'Software',
|
||||
|
||||
@ -4,15 +4,15 @@ import MarkdownPage from '../markdownPage';
|
||||
import { getLanguage } from '../../Language/Language';
|
||||
import { getString } from '../../Language/LanguageStrings'
|
||||
|
||||
const JapaneseMain = () => {
|
||||
const JapanMain = () => {
|
||||
const language = getLanguage();
|
||||
|
||||
return (
|
||||
<article className="main-page">
|
||||
<h1 id="list-intro" className="text-primary">{getString('japanese')} <Emoji symbol="🇯🇵" /></h1>
|
||||
<MarkdownPage md={'Japan/' + language + '/main.md'} />
|
||||
<h1 id="list-intro" className="text-primary">{getString('japan')} <Emoji symbol="🇯🇵" /></h1>
|
||||
<MarkdownPage md={'Japan/' + language + '/main.md'} />
|
||||
</article>
|
||||
)
|
||||
}
|
||||
|
||||
export default JapaneseMain;
|
||||
export default JapanMain;
|
||||
@ -3,7 +3,7 @@ import JapanMap from './components/JapanMap';
|
||||
import Dropdown from './components/Dropdown';
|
||||
import { getString } from '../../Language/LanguageStrings'
|
||||
|
||||
const Japan = () => {
|
||||
const JapanMapPage = () => {
|
||||
const [selectedColor, setSelectedColor] = useState('');
|
||||
|
||||
const handleColorChange = (event) => {
|
||||
@ -25,4 +25,4 @@ const Japan = () => {
|
||||
)
|
||||
}
|
||||
|
||||
export default Japan;
|
||||
export default JapanMapPage;
|
||||
44
src/Pages/Japan/Japanese/en/dake-vs-shika.md
Normal file
44
src/Pages/Japan/Japanese/en/dake-vs-shika.md
Normal file
@ -0,0 +1,44 @@
|
||||
## だけ vs しか
|
||||
|
||||
Source video: [ONLY in Japanese だけ vs しか Differences(Common Mistake) - JLPT N4&5](https://www.youtube.com/watch?v=KmBVQM_l2wY&t=9s) by: [Japanese Ammo with Misa](https://www.youtube.com/@JapaneseAmmowithMisa)
|
||||
|
||||
---
|
||||
|
||||
日本語<Jps colour="c1" text="だけ"/>話せます。 日本語<Jps colour="c1" text="しか"/>話せま<Jps colour="c2" underline=true text="せん"/>。
|
||||
|
||||
Both mean: "I <Jps colour="c1" text="only"/> speak Japanese."
|
||||
|
||||
---
|
||||
|
||||
日本語しか話せません。
|
||||
|
||||
"<Jps strikethrough=true text="I only don't speak Japanese"/>."
|
||||
|
||||
A good way to remember this, is to instead translate <Jps colour="c1" text="しか"/> as:
|
||||
|
||||
"I speak <Jps colour="c1" text="nothing but"/> Japanese."
|
||||
|
||||
---
|
||||
|
||||
<Jps colour="dim1" text="ニュアンスの違い"/>
|
||||
|
||||
日本語<Jps colour="c1" text="だけ"/>話せます。= **factual / neutral feeling**
|
||||
|
||||
日本語<Jps colour="c1" text="しか"/>話せま<Jps colour="c2" underline=true text="せん"/>。 = **strong / negative feeling**
|
||||
|
||||
|
||||
---
|
||||
|
||||
<Jps colour="dim1" text="Difference"/>
|
||||
|
||||
You cannot use しか at the end of a sentence. You can do so with だけ.
|
||||
|
||||
<Jps strikethrough=true text="私しか"/>? 私だけ?
|
||||
|
||||
好きなの本は『ロード・オブ・ザ・リング』<Jps colour="c1" text="だけ"/>。
|
||||
|
||||
好きなの本は『ロード・オブ・ザ・リング』<Jps colour="c3" strikethrough=true text="しか"/>。
|
||||
|
||||
But you can use しか at the end by adding a negative form.
|
||||
|
||||
好きなの本は『ロード・オブ・ザ・リング』<Jps colour="c2" text="しか"/><Jps colour="c2" underline=true text="ない"/>です。
|
||||
@ -1,6 +1,12 @@
|
||||
The Japanase language has facinated me for many years now, for I am married with a Japanese. To become fluent means practice every single day, no exceptions.
|
||||
The country of Japan and the Japanese language has facinated me for many years now, for I am married with a Japanese. To become fluent means practice every single day, no exceptions.
|
||||
|
||||
* [Wani Kani](https://www.wanikani.com/users/PA4KEV)
|
||||
* [Map of Japan](./japanMap)
|
||||
|
||||
---
|
||||
|
||||
* [Map of Japan](./japanMap)
|
||||
### Japanese language notes
|
||||
|
||||
These pages contain my notes on learning the language.
|
||||
|
||||
* [だけ vs しか](./japanese/dake-vs-shika)
|
||||
@ -1,4 +1,4 @@
|
||||
De Japanse taal heeft mij al jaren gefacineerd. Ik ben ook getrouwd met een Japanse. Om de taal vloeiend te kunnen beheersen, moet je elke dag oefenen. Geen uitzonderingen.
|
||||
Het land Japan en de Japanse taal hebben mij al jaren gefacineerd. Ik ben ook getrouwd met een Japanse. Om de taal vloeiend te kunnen beheersen, moet je elke dag oefenen. Geen uitzonderingen.
|
||||
|
||||
* [Wani Kani](https://www.wanikani.com/users/PA4KEV)
|
||||
|
||||
|
||||
@ -34,7 +34,7 @@ const Navigation = () => {
|
||||
{getString('portal')}
|
||||
</a>
|
||||
<ul className="dropdown-menu">
|
||||
<li><Link reloadDocument to={currentLanguage + '/japan/'} className="dropdown-item">{getString('japanese')}</Link></li>
|
||||
<li><Link reloadDocument to={currentLanguage + '/japan/'} className="dropdown-item">{getString('japan')}</Link></li>
|
||||
<li><hr className="dropdown-divider" /></li>
|
||||
<li><Link reloadDocument to={currentLanguage + '/radio/'} className="dropdown-item">{getString('radio_amateur')}</Link></li>
|
||||
<li><hr className="dropdown-divider" /></li>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user