Skip to content

Commit ae9dc0f

Browse files
luca-vogelsluca-vogels
committed
Bugfix and reordering translation files
1 parent dc3fd11 commit ae9dc0f

File tree

6 files changed

+36
-24
lines changed

6 files changed

+36
-24
lines changed

‎translations/de.json‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
11
{
22
"languageName": "Deutsch",
3-
"pageTitleStart": "PHP-Framework von %%NAME%%",
4-
"pageDescriptionError": "Die angeforderte Resource konnte nicht gefunden werden",
5-
"pageDescriptionStart": "Beispiel Startseite erstellt mit diesem Frameworks",
63

7-
"pageTitleLanguageEditor": "Spracheditor - PHP Framework von LupCode",
4+
"pageErrorTitle": "Fehler",
5+
"pageErrorDescription": "Die angeforderte Resource konnte nicht gefunden werden",
6+
7+
"pageLanguageEditorTitle": "Spracheditor - PHP Framework von LupCode",
8+
9+
"pageStartTitle": "PHP-Framework von %%NAME%%",
10+
"pageStartDescription": "Beispiel Startseite erstellt mit diesem Frameworks",
11+
12+
813
"Cancel": "Abbruch",
914
"Create": "Erstellen",
1015
"CreateNewLanguage": "Neue Sprache erstellen",

‎translations/en.json‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,15 @@
11
{
2+
"languageName": "English",
3+
4+
"pageErrorTitle": "Error",
5+
"pageErrorDescription": "The requested resource could not be found",
6+
7+
"pageLanguageEditorTitle": "Language Editor - PHP Framework by LupCode",
8+
9+
"pageStartTitle": "PHP-Framework by %%NAME%%",
10+
"pageStartDescription": "Example start page created with this framework",
11+
12+
213
"Cancel": "Cancel",
314
"Create": "Create",
415
"CreateNewLanguage": "Create new language",
@@ -9,13 +20,8 @@
920
"NewLanguageCode": "New language code",
1021
"NotSavedYet": "Not saved yet!",
1122
"Save": "Save",
12-
"SelectLanguageAndEditText": "Select a language and edit the text fields. Don't forget to click on 'save'",
1323
"SelectedLanguage": "Selected Language",
24+
"SelectLanguageAndEditText": "Select a language and edit the text fields. Don't forget to click on 'save'",
1425
"SomeFileSomethingMissing": "In some file(s) is something missing",
15-
"Text": "Text",
16-
"languageName": "English",
17-
"pageDescriptionError": "The requested URL was not found",
18-
"pageDescriptionStart": "Example start page created with this framework",
19-
"pageTitleLanguageEditor": "Language Editor - PHP Framework by LupCode",
20-
"pageTitleStart": "PHP-Framework by %%NAME%%"
26+
"Text": "Text"
2127
}

‎translations/globals.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"languageNameDE": "Deutsch",
33
"languageNameEN": "English",
4-
"pageKeywordsStartDE": "Start,Framework,PHP,%%NAME%%",
5-
"pageKeywordsStartEN": "Start,Framework,PHP,%%NAME%%"
4+
5+
"pageStartKeywordsDE": "Start,Framework,PHP,%%NAME%%",
6+
"pageStartKeywordsEN": "Start,Framework,PHP,%%NAME%%"
67
}

‎views/error/index.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@
66
?><!DOCTYPE html>
77
<html lang="<?php echo LANGUAGE_CODE; ?>">
88
<head>
9-
<title>Example error page</title>
9+
<title><?php echo TEXT['pageErrorTitle'] ?></title>
1010
<?php include(SCRIPTS.'metatags.php'); ?>
1111

1212
<?php
13-
echo '<meta name="description" content="'.TEXT['pageDescriptionError'].'">';
13+
echo '<meta name="description" content="'.TEXT['pageErrorDescription'].'">';
1414
?>
1515

1616
</head>
1717
<body>
18-
<h1>Example error page</h1>
18+
<h1><?php echo TEXT['pageErrorTitle'] ?></h1>
1919
<p>This example page has been loaded from 'views/error/index.php'</p>
2020
<p>The text on this page should have been loaded from the translations directory, so be careful to don't forget it!</p>
2121
</body>

‎views/language-editor/index.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ function languageEditorUnchanged(){
127127
</script>
128128
<html lang="<?php echo LANGUAGE_CODE; ?>">
129129
<head>
130-
<title>Language Editor - PHP Framework by LupCode</title>
130+
<title><?php echo TEXT['pageLanguageEditorTitle']; ?></title>
131131
<?php include(SCRIPTS.'metatags.php'); ?>
132132
<meta name="robots" content="noindex">
133133
</head>

‎views/start/index.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
?><!DOCTYPE html>
77
<html lang="<?php echo LANGUAGE_CODE; ?>">
88
<head>
9-
<title><?php echo TEXT['pageTitleStart']; ?></title>
9+
<title><?php echo TEXT['pageStartTitle']; ?></title>
1010
<?php include(SCRIPTS.'metatags.php'); ?>
1111

1212
<?php
1313
foreach(SUPPORTED_LANGUAGES as $lang)
14-
echo '<meta name="keywords" lang="'.$lang.'" content="'.TEXT['pageKeywordsStart'.strtoupper($lang)].'">';
14+
echo '<meta name="keywords" lang="'.$lang.'" content="'.TEXT['pageStartKeywords'.strtoupper($lang)].'">';
1515

16-
echo '<meta name="description" content="'.TEXT['pageDescriptionStart'].'">';
16+
echo '<meta name="description" content="'.TEXT['pageStartDescription'].'">';
1717
?>
1818
<link rel="canonical" href="<?php echo 'https://'.$_SERVER['SERVER_NAME'].'/'.LANGUAGE_CODE.'/'.REQUEST; ?>">
1919

@@ -37,10 +37,10 @@
3737
<a class="nodrag noselect" target="_blank" href="https://php.net">
3838
<img src="<?php echo IMAGES; ?>favicons/favicon.svg" dragable="false" width="35" height="35" alt="PHP"></img>
3939
</a>
40-
<h1 class="noselect nodrag"><?php echo TEXT['pageTitleStart']; ?></h1>
40+
<h1 class="noselect nodrag"><?php echo TEXT['pageStartTitle']; ?></h1>
4141
<div></div>
4242
</header>
43-
<div class="main">
43+
<main class="main">
4444
<?php
4545

4646
// Example for PREFIX_FALLBACKS. Every URI that starts with 'start/' will also trigger this page
@@ -50,9 +50,9 @@
5050
echo '<a href="'.REQUEST_PREFIX_BASE.($num+1).'"><h2>&gt; '.$num.' &lt;</h2></a>';
5151
}
5252
?>
53-
<p><?php echo TEXT['pageDescriptionStart']; ?></p>
53+
<p><?php echo TEXT['pageStartDescription']; ?></p>
5454
<a class="nodrag" target="_blank" href="https://github.com/LupCode/php-framework">GitHub Repository</a>
55-
</div>
55+
</main>
5656
<footer>
5757
<a class="noselect nodrag" target="_blank" href="https://lupcode.com"><?php echo NAME; ?></a>
5858
<a href="<?php echo BASE; ?>start/1"><?php echo TEXT['ExampleCounter']; ?></a>

0 commit comments

Comments
 (0)