From f57f9852b198ec15ea7e9dbd20ebcf97a09112a9 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Tue, 22 Feb 2011 15:35:33 -0800
Subject: [PATCH] pulled strings from one more template

---
 mod/notifications.php       |  3 +++
 util/strings.php            |  3 +++
 view/de/netfriend.tpl       | 14 --------------
 view/de/strings.php         |  3 +++
 view/fr/netfriend.tpl       | 14 --------------
 view/fr/strings.php         |  3 +++
 view/it/netfriend.tpl       | 14 --------------
 view/it/strings.php         |  3 +++
 view/{en => }/netfriend.tpl |  6 +++---
 9 files changed, 18 insertions(+), 45 deletions(-)
 delete mode 100644 view/de/netfriend.tpl
 delete mode 100644 view/fr/netfriend.tpl
 delete mode 100644 view/it/netfriend.tpl
 rename view/{en => }/netfriend.tpl (83%)

diff --git a/mod/notifications.php b/mod/notifications.php
index 49157c4442..93ca82bb0c 100644
--- a/mod/notifications.php
+++ b/mod/notifications.php
@@ -108,6 +108,9 @@ function notifications_content(&$a) {
 					'$intro_id' => $rr['intro_id'],
 					'$friend_selected' => $friend_selected,
 					'$fan_selected' => $fan_selected,
+					'$approve_as' => t('Approve as: '),
+					'$as_friend' => t('Friend'),
+					'$as_fan' => t('Fan/Admirer')
 				));
 			}			
 
diff --git a/util/strings.php b/util/strings.php
index 8dabb064d2..747d8ef48f 100644
--- a/util/strings.php
+++ b/util/strings.php
@@ -276,6 +276,9 @@ $a->strings['Hide Ignored Requests'] = 'Hide Ignored Requests';
 $a->strings['Claims to be known to you: '] = 'Claims to be known to you: ';
 $a->strings['yes'] = 'yes';
 $a->strings['no'] = 'no';
+$a->strings['Approve as: '] = 'Approve as: ';
+$a->strings['Friend'] = 'Friend';
+$a->strings['Fan/Admirer'] = 'Fan/Admirer';
 $a->strings['Notification type: '] = 'Notification type: ';
 $a->strings['Friend/Connect Request'] = 'Friend/Connect Request';
 $a->strings['New Follower'] = 'New Follower';
diff --git a/view/de/netfriend.tpl b/view/de/netfriend.tpl
deleted file mode 100644
index 79a7a0940a..0000000000
--- a/view/de/netfriend.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-<div class="intro-approve-as-friend-desc">Genehmigen als: </div>
-
-<div class="intro-approve-as-friend-wrapper">
-	<label class="intro-approve-as-friend-label" for="intro-approve-as-friend-$intro_id">Freund</label>
-	<input type="radio" name="duplex" id="intro-approve-as-friend-$intro_id" class="intro-approve-as-friend" $friend_selected value="1" />
-	<div class="intro-approve-friend-break" ></div>	
-</div>
-<div class="intro-approve-as-friend-end"></div>
-<div class="intro-approve-as-fan-wrapper">
-	<label class="intro-approve-as-fan-label" for="intro-approve-as-fan-$intro_id">Fan/Verehrer</label>
-	<input type="radio" name="duplex" id="intro-approve-as-fan-$intro_id" class="intro-approve-as-fan" $fan_selected value="0"  />
-	<div class="intro-approve-fan-break"></div>
-</div>
-<div class="intro-approve-as-end"></div>
diff --git a/view/de/strings.php b/view/de/strings.php
index ef6892e8d0..cc03196066 100644
--- a/view/de/strings.php
+++ b/view/de/strings.php
@@ -274,6 +274,9 @@ $a->strings['Hide Ignored Requests'] = 'Verberge ignorierte Anfragen';
 $a->strings['Claims to be known to you: '] = 'Behauptet dich zu kennen: ';
 $a->strings['yes'] = 'ja';
 $a->strings['no'] = 'nein';
+$a->strings['Approve as: '] = 'Genehmigen als: ';
+$a->strings['Friend'] = 'Freund';
+$a->strings['Fan/Admirer'] = 'Fan/Verehrer';
 $a->strings['Notification type: '] = 'Benachrichtigungs Typ: ';
 $a->strings['Friend/Connect Request'] = 'Kontakt-/Freundschaftsanfrage';
 $a->strings['New Follower'] = 'Neuer Bewunderer';
diff --git a/view/fr/netfriend.tpl b/view/fr/netfriend.tpl
deleted file mode 100644
index b041ec49f7..0000000000
--- a/view/fr/netfriend.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-<div class="intro-approve-as-friend-desc">Approve as: </div>
-
-<div class="intro-approve-as-friend-wrapper">
-	<label class="intro-approve-as-friend-label" for="intro-approve-as-friend-$intro_id">Friend</label>
-	<input type="radio" name="duplex" id="intro-approve-as-friend-$intro_id" class="intro-approve-as-friend" $friend_selected value="1" />
-	<div class="intro-approve-friend-break" ></div>	
-</div>
-<div class="intro-approve-as-friend-end"></div>
-<div class="intro-approve-as-fan-wrapper">
-	<label class="intro-approve-as-fan-label" for="intro-approve-as-fan-$intro_id">Fan/Admirer</label>
-	<input type="radio" name="duplex" id="intro-approve-as-fan-$intro_id" class="intro-approve-as-fan" $fan_selected value="0"  />
-	<div class="intro-approve-fan-break"></div>
-</div>
-<div class="intro-approve-as-end"></div>
diff --git a/view/fr/strings.php b/view/fr/strings.php
index 8bac6347f9..cbcf11ead8 100644
--- a/view/fr/strings.php
+++ b/view/fr/strings.php
@@ -262,6 +262,9 @@ $a->strings['Hide Ignored Requests'] = 'Cacher les demandes ignorées';
 $a->strings['Claims to be known to you: '] = 'Prétend que vous le connaissez: ';
 $a->strings['yes'] = 'oui';
 $a->strings['no'] = 'non';
+$a->strings['Approve as: '] = 'Approuver en tant que: ';
+$a->strings['Friend'] = 'Ami';
+$a->strings['Fan/Admirer'] = 'Fan/Admirateur';
 $a->strings['Notification type: '] = 'Type de notification: ';
 $a->strings['Friend/Connect Request'] = 'Demande de connexion/relation';
 $a->strings['New Follower'] = 'Nouvel abonné';
diff --git a/view/it/netfriend.tpl b/view/it/netfriend.tpl
deleted file mode 100644
index d1cdf1a98d..0000000000
--- a/view/it/netfriend.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-<div class="intro-approve-as-friend-desc">Approva come: </div>
-
-<div class="intro-approve-as-friend-wrapper">
-	<label class="intro-approve-as-friend-label" for="intro-approve-as-friend-$intro_id">Amico</label>
-	<input type="radio" name="duplex" id="intro-approve-as-friend-$intro_id" class="intro-approve-as-friend" $friend_selected value="1" />
-	<div class="intro-approve-friend-break" ></div>	
-</div>
-<div class="intro-approve-as-friend-end"></div>
-<div class="intro-approve-as-fan-wrapper">
-	<label class="intro-approve-as-fan-label" for="intro-approve-as-fan-$intro_id">Fan/Ammiratore</label>
-	<input type="radio" name="duplex" id="intro-approve-as-fan-$intro_id" class="intro-approve-as-fan" $fan_selected value="0"  />
-	<div class="intro-approve-fan-break"></div>
-</div>
-<div class="intro-approve-as-end"></div>
diff --git a/view/it/strings.php b/view/it/strings.php
index d04e021675..2b4a84d052 100644
--- a/view/it/strings.php
+++ b/view/it/strings.php
@@ -236,6 +236,9 @@ $a->strings['Hide Ignored Requests'] = 'Nascondi richieste ignorate';
 $a->strings['Claims to be known to you: '] = 'Dice di conoscerti: ';
 $a->strings['yes'] = 'si';
 $a->strings['no'] = 'no';
+$a->strings['Approve as: '] = 'Approva come: ';
+$a->strings['Friend'] = 'Amico';
+$a->strings['Fan/Admirer'] = 'Fan/Admiratore';
 $a->strings['Notification type: '] = 'Tipo di notifica: ';
 $a->strings['Friend/Connect Request'] = 'Richiesta Amicizia/Connessione';
 $a->strings['New Follower'] = 'Nuovo Seguace';
diff --git a/view/en/netfriend.tpl b/view/netfriend.tpl
similarity index 83%
rename from view/en/netfriend.tpl
rename to view/netfriend.tpl
index b041ec49f7..c2a92ce9ed 100644
--- a/view/en/netfriend.tpl
+++ b/view/netfriend.tpl
@@ -1,13 +1,13 @@
-<div class="intro-approve-as-friend-desc">Approve as: </div>
+<div class="intro-approve-as-friend-desc">$approve_as</div>
 
 <div class="intro-approve-as-friend-wrapper">
-	<label class="intro-approve-as-friend-label" for="intro-approve-as-friend-$intro_id">Friend</label>
+	<label class="intro-approve-as-friend-label" for="intro-approve-as-friend-$intro_id">$as_friend</label>
 	<input type="radio" name="duplex" id="intro-approve-as-friend-$intro_id" class="intro-approve-as-friend" $friend_selected value="1" />
 	<div class="intro-approve-friend-break" ></div>	
 </div>
 <div class="intro-approve-as-friend-end"></div>
 <div class="intro-approve-as-fan-wrapper">
-	<label class="intro-approve-as-fan-label" for="intro-approve-as-fan-$intro_id">Fan/Admirer</label>
+	<label class="intro-approve-as-fan-label" for="intro-approve-as-fan-$intro_id">$as_fan</label>
 	<input type="radio" name="duplex" id="intro-approve-as-fan-$intro_id" class="intro-approve-as-fan" $fan_selected value="0"  />
 	<div class="intro-approve-fan-break"></div>
 </div>