l10n/i18n changes per issue #4

lafnlab · Jan 30, 2019 · e130e1d · e130e1d
1 parent 0f853d1
commit e130e1d
Show file tree

Hide file tree

Showing 36 changed files with 117 additions and 146 deletions.
diff --git a/pub/dash/add-currency.php b/pub/dash/add-currency.php
@@ -36,9 +36,6 @@
 	$max_post_length			= $mysiteopt['max_post_length'];
 }
 
-$pagetitle 	= _("Add a currency");
-#$message		= 'test message';
-
 // PROCESSING
 if (isset($_POST['currsubmit'])) {
 
@@ -66,7 +63,6 @@
 	}
 
 } // if isset $_POST 'currsubmit'
-
 include_once "dash-header.php";
 include_once "dash-nav.php";
 ?>
@@ -77,7 +73,7 @@
 ?>
 		<article class="w3-col w3-panel w3-cell m9">
 			<div class="w3-card-2 w3-theme-l3 w3-padding">
-				<h4><?php echo $pagetitle; ?></h4>
+				<h4><?php echo _("Add a currency"); ?></h4>
 				<table>
 					<form id="basicform" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]); ?>">
 

diff --git a/pub/dash/add-eye-color.php b/pub/dash/add-eye-color.php
@@ -36,9 +36,6 @@
 	$max_post_length			= $mysiteopt['max_post_length'];
 }
 
-$pagetitle 	= _("Add an eye color");
-#$message		= 'test message';
-
 // PROCESSING
 if (isset($_POST['eyesubmit'])) {
 
@@ -72,7 +69,7 @@
 ?>
 		<article class="w3-col w3-panel w3-cell m9">
 			<div class="w3-card-2 w3-theme-l3 w3-padding">
-				<h4><?php echo $pagetitle; ?></h4>
+				<h4><?php echo _("Add an eye color"); ?></h4>
 				<form id="basicform" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]); ?>">
 					<table>
 						<tr>

diff --git a/pub/dash/add-gender.php b/pub/dash/add-gender.php
@@ -36,9 +36,6 @@
 	$max_post_length			= $mysiteopt['max_post_length'];
 }
 
-$pagetitle 	= _("Add a gender");
-#$message		= 'test message';
-
 // PROCESSING
 if (isset($_POST['gensubmit'])) {
 
@@ -72,7 +69,7 @@
 ?>
 		<article class="w3-col w3-panel w3-cell m9">
 			<div class="w3-card-2 w3-theme-l3 w3-padding">
-				<h4><?php echo $pagetitle; ?></h4>
+				<h4><?php echo _("Add a gender"); ?></h4>
 				<form id="basicform" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]); ?>">
 					<table>
 						<tr>

diff --git a/pub/dash/add-hair-color.php b/pub/dash/add-hair-color.php
@@ -36,9 +36,6 @@
 	$max_post_length			= $mysiteopt['max_post_length'];
 }
 
-$pagetitle 	= _("Add a hair color");
-#$message		= 'test message';
-
 // PROCESSING
 if (isset($_POST['harsubmit'])) {
 
@@ -72,7 +69,7 @@
 ?>
 		<article class="w3-col w3-panel w3-cell m9">
 			<div class="w3-card-2 w3-theme-l3 w3-padding">
-				<h4><?php echo $pagetitle; ?></h4>
+				<h4><?php echo _("Add a hair color"); ?></h4>
 				<form id="basicform" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]); ?>">
 					<table>
 						<tr>

diff --git a/pub/dash/add-locale.php b/pub/dash/add-locale.php
@@ -36,9 +36,6 @@
 	$max_post_length			= $mysiteopt['max_post_length'];
 }
 
-$pagetitle 	= _("Add a locale");
-#$message		= 'test message';
-
 // PROCESSING
 if (isset($_POST['i18submit'])) {
 
@@ -73,7 +70,7 @@
 ?>
 		<article class="w3-col w3-panel w3-cell m9">
 			<div class="w3-card-2 w3-theme-l3 w3-padding">
-				<h4><?php echo $pagetitle; ?></h4>
+				<h4><?php echo _("Add a locale"); ?></h4>
 				<form id="basicform" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]); ?>">
 					<table>
 						<tr>

diff --git a/pub/dash/add-nationality.php b/pub/dash/add-nationality.php
@@ -36,9 +36,6 @@
 	$max_post_length			= $mysiteopt['max_post_length'];
 }
 
-$pagetitle 	= _("Add a nationality");
-#$message		= 'test message';
-
 // PROCESSING
 if (isset($_POST['natsubmit'])) {
 
@@ -72,7 +69,7 @@
 ?>
 		<article class="w3-col w3-panel w3-cell m9">
 			<div class="w3-card-2 w3-theme-l3 w3-padding">
-				<h4><?php echo $pagetitle; ?></h4>
+				<h4><?php echo _("Add a nationality"); ?></h4>
 				<form id="basicform" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]); ?>">
 					<table>
 						<tr>

diff --git a/pub/dash/add-place.php b/pub/dash/add-place.php
@@ -36,9 +36,6 @@
 	$max_post_length			= $mysiteopt['max_post_length'];
 }
 
-$pagetitle 	= _("Add a place/location)";
-#$message		= 'test message';
-
 // PROCESSING
 if (isset($_POST['placesubmit'])) {
 
@@ -73,7 +70,7 @@
 ?>
 		<article class="w3-col w3-panel w3-cell m9">
 			<div class="w3-card-2 w3-theme-l3 w3-padding">
-				<h4><?php echo $pagetitle; ?></h4>
+				<h4><?php echo _("Add a place/location)"; ?></h4>
 			<form id="basicform" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]); ?>">
 				<table>
 					<tr>

diff --git a/pub/dash/add-post.php b/pub/dash/add-post.php
@@ -90,8 +90,6 @@
 }
 
 $visitortitle = $usrname;
-$pagetitle 	= _("Add a post");
-#$message		= 'test message';
 
 // PROCESSING
 if (isset($_POST['addpostsubmit'])) {

diff --git a/pub/dash/add-sexuality.php b/pub/dash/add-sexuality.php
@@ -36,9 +36,6 @@
 	$max_post_length			= $mysiteopt['max_post_length'];
 }
 
-$pagetitle 	= _("Add a sexuality");
-#$message		= 'test message';
-
 // PROCESSING
 if (isset($_POST['sxusubmit'])) {
 
@@ -72,7 +69,7 @@
 ?>
 		<article class="w3-col w3-panel w3-cell m9">
 			<div class="w3-card-2 w3-theme-l3 w3-padding">
-				<h4><?php echo $pagetitle; ?></h4>
+				<h4><?php echo _("Add a sexuality"); ?></h4>
 				<form id="basicform" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]); ?>">
 					<table>
 						<tr>

diff --git a/pub/dash/add-spoken-language.php b/pub/dash/add-spoken-language.php
@@ -36,9 +36,6 @@
 	$max_post_length			= $mysiteopt['max_post_length'];
 }
 
-$pagetitle 	= _("Add a spoken language");
-#$message		= 'test message';
-
 // PROCESSING
 if (isset($_POST['spksubmit'])) {
 
@@ -72,7 +69,7 @@
 ?>
 		<article class="w3-col w3-panel w3-cell m9">
 			<div class="w3-card-2 w3-theme-l3 w3-padding">
-				<h4><?php echo $pagetitle; ?></h4>
+				<h4><?php echo _("Add a spoken language"); ?></h4>
 				<form id="basicform" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]); ?>">
 					<table>
 						<tr>

diff --git a/pub/dash/add-time-zone.php b/pub/dash/add-time-zone.php
@@ -36,9 +36,6 @@
 	$max_post_length			= $mysiteopt['max_post_length'];
 }
 
-$pagetitle 	= _("Add a time zone");
-#$message		= 'test message';
-
 // PROCESSING
 if (isset($_POST['tztsubmit'])) {
 
@@ -75,7 +72,7 @@
 ?>
 		<article class="w3-col w3-panel w3-cell m9">
 			<div class="w3-card-2 w3-theme-l3 w3-padding">
-				<h4><?php echo $pagetitle; ?></h4>
+				<h4><?php echo _("Add a time zone"); ?></h4>
 				<form id="basicform" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]); ?>">
 					<table>
 						<tr>

diff --git a/pub/dash/dash-header.php b/pub/dash/dash-header.php
@@ -7,8 +7,11 @@
  * since Amore version 0.1
  *
  */
+ if(isset($_COOKIE['loc'])) {
+	$user_locale = $_COOKIE['loc'];
+ }
 
- 	// have Amore use the right localization
+  	// have Amore use the right localization
 	putenv("LC_MESSAGES=".$user_locale);
 	setlocale(LC_MESSAGES, $user_locale);
 

diff --git a/pub/dash/edit-currency.php b/pub/dash/edit-currency.php
@@ -55,9 +55,6 @@
 	}
 }
 
-$pagetitle 	= _("Edit ").$dinname;
-#$message		= 'test message';
-
 // PROCESSING
 if (isset($_POST['currsubmit'])) {
 
@@ -88,7 +85,7 @@
 ?>
 		<article class="w3-col w3-panel w3-cell m9">
 			<div class="w3-card-2 w3-theme-l3 w3-padding">
-				<h4><?php echo $pagetitle; ?></h4>
+				<h4><?php echo _("Edit ").$dinname; ?></h4>
 				<table>
 					<form id="basicform" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]); ?>">
 					<input type="hidden" name="currid" value="<?php echo $dinid; ?>">

diff --git a/pub/dash/edit-eye-color.php b/pub/dash/edit-eye-color.php
@@ -51,9 +51,6 @@
 	}
 }
 
-$pagetitle 	= _("Edit ").$eyecolor._(" eye color");
-#$message		= 'test message';
-
 // PROCESSING
 if (isset($_POST['eyesubmit'])) {
 
@@ -76,7 +73,7 @@
 ?>
 		<article class="w3-col w3-panel w3-cell m9">
 			<div class="w3-card-2 w3-theme-l3 w3-padding">
-				<h4><?php echo $pagetitle; ?></h4>
+				<h4><?php echo _("Edit ").$eyecolor._(" eye color"); ?></h4>
 				<form id="basicform" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]); ?>">
 				<input type="hidden" name="eyeid" value="<?php echo $eyeid; ?>">
 					<table>

diff --git a/pub/dash/edit-gender.php b/pub/dash/edit-gender.php
@@ -50,8 +50,6 @@
 		$genname		= $genopt['genders_name'];
 	}
 }
-$pagetitle 	= _("Edit ").$genname;
-#$message		= 'test message';
 
 // PROCESSING
 if (isset($_POST['gensubmit'])) {
@@ -75,7 +73,7 @@
 ?>
 		<article class="w3-col w3-panel w3-cell m9">
 			<div class="w3-card-2 w3-theme-l3 w3-padding">
-				<h4><?php echo $pagetitle; ?></h4>
+				<h4><?php echo _("Edit ").$genname; ?></h4>
 				<form id="basicform" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]); ?>">
 				<input type="hidden" name="genid" value="<?php echo $genid; ?>">
 					<table>

diff --git a/pub/dash/edit-hair-color.php b/pub/dash/edit-hair-color.php
@@ -52,9 +52,6 @@
 	}
 }
 
-$pagetitle 	= _("Edit ").$harcolor;
-#$message		= 'test message';
-
 // PROCESSING
 if (isset($_POST['harsubmit'])) {
 
@@ -78,7 +75,7 @@
 ?>
 		<article class="w3-col w3-panel w3-cell m9">
 			<div class="w3-card-2 w3-theme-l3 w3-padding">
-				<h4><?php echo $pagetitle; ?></h4>
+				<h4><?php echo _("Edit ").$harcolor; ?></h4>
 				<form id="basicform" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]); ?>">
 				<input type="hidden" name="harid" value="<?php echo $harid; ?>">
 					<table>

diff --git a/pub/dash/edit-locale.php b/pub/dash/edit-locale.php
@@ -55,11 +55,10 @@
 }
 
 if ($i18ctry != "") {
-	$pagetitle 	= _("Edit ").$i18lang."_".$i18ctry;
+	$pagetitle 	= $i18lang."_".$i18ctry;
 } else {
-	$pagetitle	= _("Edit ").$i18lang;
+	$pagetitle	= $i18lang;
 }
-#$message		= 'test message';
 
 // PROCESSING
 if (isset($_POST['i18submit'])) {
@@ -87,7 +86,7 @@
 ?>
 		<article class="w3-col w3-panel w3-cell m9">
 			<div class="w3-card-2 w3-theme-l3 w3-padding">
-				<h4><?php echo $pagetitle; ?></h4>
+				<h4><?php echo _("Edit ").$pagetitle; ?></h4>
 				<form id="basicform" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]); ?>">
 				<input type="hidden" name="i18id" value="<?php echo $i18id; ?>">
 					<table>

diff --git a/pub/dash/edit-nationality.php b/pub/dash/edit-nationality.php
@@ -52,9 +52,6 @@
 	}
 }
 
-$pagetitle 	= _("Edit ").$natname;
-#$message		= 'test message';
-
 // PROCESSING
 if (isset($_POST['natsubmit'])) {
 
@@ -77,7 +74,7 @@
 ?>
 		<article class="w3-col w3-panel w3-cell m9">
 			<div class="w3-card-2 w3-theme-l3 w3-padding">
-				<h4><?php echo $pagetitle; ?></h4>
+				<h4><?php echo _("Edit ").$natname; ?></h4>
 				<form id="basicform" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]); ?>">
 				<input type="hidden" name="natid" value="<?php echo $natid; ?>">
 					<table>

diff --git a/pub/dash/edit-place.php b/pub/dash/edit-place.php
@@ -54,9 +54,6 @@
 	}
 }
 
-$pagetitle 	= _("Edit ").$planame;
-#$message		= 'test message';
-
 // PROCESSING
 if (isset($_POST['placesubmit'])) {
 
@@ -81,7 +78,7 @@
 ?>
 		<article class="w3-col w3-panel w3-cell m9">
 			<div class="w3-card-2 w3-theme-l3 w3-padding">
-				<h4><?php echo $pagetitle; ?></h4>
+				<h4><?php echo _("Edit ").$planame; ?></h4>
 			<form id="basicform" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]); ?>">
 			<input type="hidden" name="placeid" value="<?php echo $plaid; ?>">
 				<table>

diff --git a/pub/dash/edit-profile.php b/pub/dash/edit-profile.php
@@ -74,7 +74,6 @@
 }
 $objdescription = _("Dashboard for ").$usrname;
 $visitortitle = $usrname;
-$pagetitle = _("Edit your profile");
 
 // POST FORM SUBMISSION PROCESSING
 if (isset($_POST['prosubmit'])) {
@@ -160,7 +159,7 @@
 ?>
 			<article class="w3-col w3-panel w3-cell m8">
 				<div class="w3-card-2 w3-theme-l3 w3-padding">
-					<h4><?php echo $pagetitle; ?></h4>
+					<h4><?php echo _("Edit your profile"); ?></h4>
 				<table>
 					<form id="editprofile" class="w3-card-2 w3-theme-l3 w3-padding maincard" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]."?uid=".$usrid); ?>">
 					<tr>

diff --git a/pub/dash/edit-sexuality.php b/pub/dash/edit-sexuality.php
@@ -52,9 +52,6 @@
 	}
 }
 
-$pagetitle 	= _("Edit ").$sexname;
-#$message		= 'test message';
-
 // PROCESSING
 if (isset($_POST['sxusubmit'])) {
 
@@ -77,7 +74,7 @@
 ?>
 		<article class="w3-col w3-panel w3-cell m9">
 			<div class="w3-card-2 w3-theme-l3 w3-padding">
-				<h4><?php echo $pagetitle; ?></h4>
+				<h4><?php echo _("Edit ").$sexname; ?></h4>
 				<form id="basicform" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]); ?>">
 				<input type="hidden" name="sxuid" value="<?php echo $sexid; ?>">
 					<table>