Home Explore Help
Register Sign In
goodoldpaul
/
MastodonStartpage
1
0
Fork 0
Files
Browse Source

'Versione in inglese' dei dati dell'istanza

pezcurrel 4 years ago
parent
96d40405c6
commit
f75765f78c
4 changed files with 166 additions and 139 deletions
Split View Show Diff Stats
  1. 6 6
      web/mustard/dafa.txt
  2. 2 0
      web/mustard/guestinsts.php
  3. 63 63
      web/mustard/include/columns.php
  4. 95 70
      web/mustard/include/dispinst.php

+ 6 - 6
web/mustard/dafa.txt
View File 

@@ -13,7 +13,7 @@
 
 * niente virtualhost, spostare mastostart nella docroot di default di apache, così che per vederlo basti andare su 172.17.0.2, senza dover toccare /etc/hosts dell'host
 
 * aggiornare update.sh così che rifletta il cambiamento al punto precedente
 
 
-- invite.php: una modalità di test che non manda le mail ma crea gli account "guest"
 
+! invite.php: una modalità di test che non manda le mail ma crea gli account "guest"
 
 - "stabilizzare" $cjrand in glob.php a una versione
 
 ? tutto: ristrutturare il layout directory?
 
 * vedere un po' se è possibile determinare quanta ram sugge il crawler, in modo da poter dare indicazioni più precise in INSTALL --- usare memory_get_peak_usage(true) --- fatto per ora con altro metodo
 
@@ -36,13 +36,8 @@
 
 * aggiungere notifica quando "guest" edita istanza
 
 ? index.php: lunghezza automatica di username
 
 - serve un "notifs.php" (è già linkato dalla lista notifiche accessibile dalla campanella) per la gestione accurata delle notifiche (possibilità di marcarle tutte o "precedenti a" come lette, possibilità di cancellarle tutte o "precedenti a")
 
-* rinominare tutto da "Mastodon Startpage Admin" a "Mustard"
 
-* crawler.php: ricorsivizzarlo? - fatto, in questo modo: peerscrawl.php crea una lista di "tutte le istanze note" a partire da una certa instanza, crawler.php usa questa lista per importare nel db i dati delle istanze che rispondono
 
-* crawler.php: le notifiche, invece di edinst.php, devono linkare un viewinst.php che mostri l'istanza
 
-* crawler.php: sarebbe tanto bello fare a meno di tutta la faccenda "tronconi" ecc.
 
 ! crawler.php: deve controllare se nella tabella Instances GuestID è definito; se è definito e la mail del corrispettivo account "guest" è cambiata, deve aggiornare l'account "guest" corrispettivo in Admins con la mail e il nome utente attuali e creare nuova password; se i dati dell'istanza sono già stati editati, mandare mail di "aggiornamento"; se non lo sono, mandare invito --- alla fine lasciam perdere, si organizzano gli admin se vogliono.
 
 - include/dispinst.php: deve essere disponibile anche in inglese, per i guest
 
-* instances.php: possibilità di filtraggio per GuestID, LastGuestEdit, OurLangsLock
 
 - instances.php: possibilità di *scegliere* la lingua da usare tra quelle supportate per il filtraggio su Localities e Languages
 
 ? instances.php: bottoni per pagina precedente-successiva
 
 - instances.php: alerta su cambio pagina quando è stato modificato filtro/ordinamento
 
@@ -52,6 +47,11 @@
 
 - instances.php: ckf: controllare che non venga eseguito ordinamento su una stessa colonna più volte (non rompe query ma è ridondante)
 
 - anche nel sito usare il menu.php nuovo
 
 
+* rinominare tutto da "Mastodon Startpage Admin" a "Mustard"
 
+* crawler.php: ricorsivizzarlo? - fatto, in questo modo: peerscrawl.php crea una lista di "tutte le istanze note" a partire da una certa instanza, crawler.php usa questa lista, insieme a quella delle istanze già note pescata dal db, per importare nel db i dati delle istanze che rispondono
 
+* crawler.php: le notifiche, invece di edinst.php, devono linkare un viewinst.php che mostri l'istanza
 
+* crawler.php: sarebbe tanto bello fare a meno di tutta la faccenda "tronconi" ecc.
 
+* instances.php: possibilità di filtraggio per GuestID, LastGuestEdit, OurLangsLock
 
 * edinst.php: su languages se account "Level" è "guest", "lock this list" dev'essere checkato per default *se "guest" non ha ancora mai modificato i dati dell'istanza*
 
 * sanificazione input: edinsth.php: su edit e add controllare sempre che il valore "nuovo" non ci sia già
 
 * aggiungere colonna "OSMID" a Localities, in modo che se aggiungiamo altre lingue in seguito sia più facile recuperarle per aggiornare la tabella

+ 2 - 0
web/mustard/guestinsts.php
View File 

@@ -20,6 +20,8 @@ function hspech($str) {
 
 	return(htmlspecialchars($str,ENT_QUOTES|ENT_HTML5,'UTF-8'));
 
 }
 
 
+$english=true;
 
+
 
 ?>
 
 <!DOCTYPE HTML>
 
 <html lang="en">

+ 63 - 63
web/mustard/include/columns.php
View File 

@@ -4,121 +4,121 @@
 
 
 $cols=array(
 
 
-	'Instances.New'=>array('field'=>'Instances.New','name'=>'[Nuova]','type'=>'bool'),
 
-	'Instances.Good'=>array('field'=>'Instances.Good','name'=>'[Papabile]','type'=>'bool'),
 
-	'Instances.Chosen'=>array('field'=>'Instances.Chosen','name'=>'[Scelta]','type'=>'bool'),
 
-	'Instances.Visible'=>array('field'=>'Instances.Visible','name'=>'[Visibile]','type'=>'bool'),
 
-	'Instances.Blacklisted'=>array('field'=>'Instances.Blacklisted','name'=>'[Blacklistata]','type'=>'bool'),
 
-	'Instances.URI'=>array('field'=>'Instances.URI','name'=>'URI','type'=>'text'),
 
-	'Instances.Title'=>array('field'=>'Instances.Title','name'=>'Titolo','type'=>'text'),
 
-	'Instances.ShortDesc'=>array('field'=>'Instances.ShortDesc','name'=>'Descrizione breve','type'=>'text'),
 
-	'Instances.LongDesc'=>array('field'=>'Instances.LongDesc','name'=>'Descrizione lunga','type'=>'text'),
 
-	'Instances.OurDesc'=>array('field'=>'Instances.OurDesc','name'=>'[Descrizione nostra (in lingua originale)]','type'=>'text'),
 
-	'Instances.OurDescEN'=>array('field'=>'Instances.OurDescEN','name'=>'[Descrizione nostra (in inglese)]','type'=>'text'),
 
+	'Instances.New'=>array('field'=>'Instances.New','name'=>'[Nuova]','nameEN'=>'[New]','type'=>'bool'),
 
+	'Instances.Good'=>array('field'=>'Instances.Good','name'=>'[Papabile]','nameEN'=>'[Good]','type'=>'bool'),
 
+	'Instances.Chosen'=>array('field'=>'Instances.Chosen','name'=>'[Scelta]','nameEN'=>'[Chosen]','type'=>'bool'),
 
+	'Instances.Visible'=>array('field'=>'Instances.Visible','name'=>'[Visibile]','nameEN'=>'[Visible]','type'=>'bool'),
 
+	'Instances.Blacklisted'=>array('field'=>'Instances.Blacklisted','name'=>'[Blacklistata]','nameEN'=>'[Blacklisted]','type'=>'bool'),
 
+	'Instances.URI'=>array('field'=>'Instances.URI','name'=>'URI','nameEN'=>'URI','type'=>'text'),
 
+	'Instances.Title'=>array('field'=>'Instances.Title','name'=>'Titolo','nameEN'=>'Title','type'=>'text'),
 
+	'Instances.ShortDesc'=>array('field'=>'Instances.ShortDesc','name'=>'Descrizione breve','nameEN'=>'Short description','type'=>'text'),
 
+	'Instances.LongDesc'=>array('field'=>'Instances.LongDesc','name'=>'Descrizione lunga','nameEN'=>'Long description','type'=>'text'),
 
+	'Instances.OurDesc'=>array('field'=>'Instances.OurDesc','name'=>'[Descrizione nostra (in lingua originale)]','nameEN'=>'[Our description (in original language)]','type'=>'text'),
 
+	'Instances.OurDescEN'=>array('field'=>'Instances.OurDescEN','name'=>'[Descrizione nostra (in inglese)]','nameEN'=>'[Our description (in english)]','type'=>'text'),
 
 
 //--------------------------------
 
 
-	'Instances.GuestID'=>array('field'=>'Instances.GuestID','name'=>'[Email admin invitat@] ►','type'=>'join','join'=>array(),'ord'=>false),
 
-	'Admins.Email'=>array('field'=>'Admins.Email','name'=>'[Email admin invitat@]','type'=>'joini','join'=>array('Admins ON Admins.ID=Instances.GuestID'),'subtype'=>'text'),
 
+	'Instances.GuestID'=>array('field'=>'Instances.GuestID','name'=>'[Email admin invitat@] ►','nameEN'=>'[Guest admin email] ►','type'=>'join','join'=>array(),'ord'=>false),
 
+	'Admins.Email'=>array('field'=>'Admins.Email','name'=>'[Email admin invitat@]','nameEN'=>'[Guest admin email]','type'=>'joini','join'=>array('Admins ON Admins.ID=Instances.GuestID'),'subtype'=>'text'),
 
 
-	'Instances.LastGuestEdit'=>array('field'=>'Instances.LastGuestEdit','name'=>'[Ultima modifica fatta dall’admin invitat@]','type'=>'time'),
 
+	'Instances.LastGuestEdit'=>array('field'=>'Instances.LastGuestEdit','name'=>'[Ultima modifica fatta dall’admin invitat@]','nameEN'=>'[Last modification by guest admin]','type'=>'time'),
 
 
 //--------------------------------
 
 
-	'Instances.LocalityID'=>array('field'=>'Instances.LocalityID','name'=>'[Località] ►','type'=>'join','join'=>array(),'ord'=>false),
 
-	'Localities.Name'=>array('field'=>'Localities.Name'.$dlang,'name'=>'[Località]','type'=>'joini','join'=>array('Localities ON Localities.ID=Instances.LocalityID'),'subtype'=>'text'),
 
+	'Instances.LocalityID'=>array('field'=>'Instances.LocalityID','name'=>'[Località] ►','nameEN'=>'[Location] ►','type'=>'join','join'=>array(),'ord'=>false),
 
+	'Localities.Name'=>array('field'=>'Localities.Name'.$dlang,'name'=>'[Località]','nameEN'=>'[Location]','type'=>'joini','join'=>array('Localities ON Localities.ID=Instances.LocalityID'),'subtype'=>'text'),
 
 
 //--------------------------------
 
 
-	'Instances.Email'=>array('field'=>'Instances.Email','name'=>'Email di contatto','type'=>'text'),
 
-	'Instances.Software'=>array('field'=>'Instances.Software','name'=>'Software','type'=>'text'),
 
-	'Instances.Version'=>array('field'=>'Instances.Version','name'=>'Versione','type'=>'text'),
 
-	'Instances.UserCount'=>array('field'=>'Instances.UserCount','name'=>'Numero utenti','type'=>'int'),
 
-	'Instances.StatusCount'=>array('field'=>'Instances.StatusCount','name'=>'Numero stati','type'=>'int'),
 
-	'Instances.DomainCount'=>array('field'=>'Instances.DomainCount','name'=>'Numero istanze note','type'=>'int'),
 
-	'Instances.ActiveUsersMonth'=>array('field'=>'Instances.ActiveUsersMonth','name'=>'Numero utenti attivi (mese)','type'=>'int'),
 
-	'Instances.ActiveUsersHalfYear'=>array('field'=>'Instances.ActiveUsersHalfYear','name'=>'Numero utenti attivi (6 mesi)','type'=>'int'),
 
-	'Instances.Thumb'=>array('field'=>'Instances.Thumb','name'=>'Logo','type'=>'text','search'=>false,'ord'=>false),
 
-	'Instances.RegOpen'=>array('field'=>'Instances.RegOpen','name'=>'Registrazioni aperte','type'=>'bool'),
 
-	'Instances.RegReqApproval'=>array('field'=>'Instances.RegReqApproval','name'=>'Approvazione registrazioni','type'=>'bool'),
 
-	'Instances.MaxTootChars'=>array('field'=>'Instances.MaxTootChars','name'=>'Limite caratteri','type'=>'int'),
 
-	'Instances.AdmAccount'=>array('field'=>'Instances.AdmAccount','name'=>'Account admin','type'=>'text'),
 
-	'Instances.AdmDisplayName'=>array('field'=>'Instances.AdmDisplayName','name'=>'Nome account admin','type'=>'text'),
 
-	'Instances.AdmCreatedAt'=>array('field'=>'Instances.AdmCreatedAt','name'=>'Data creazione account admin','type'=>'time'),
 
-	'Instances.AdmURL'=>array('field'=>'Instances.AdmURL','name'=>'Pagina dell’admin','type'=>'text','search'=>false,'ord'=>false),
 
-	'Instances.AdmAvatar'=>array('field'=>'Instances.AdmAvatar','name'=>'Avatar admin','type'=>'text','search'=>false,'ord'=>false),
 
-	'Instances.AdmNote'=>array('field'=>'Instances.AdmNote','name'=>'Note dell’admin','type'=>'text'),
 
+	'Instances.Email'=>array('field'=>'Instances.Email','name'=>'Email di contatto','nameEN'=>'Contact email','type'=>'text'),
 
+	'Instances.Software'=>array('field'=>'Instances.Software','name'=>'Software','nameEN'=>'Software','type'=>'text'),
 
+	'Instances.Version'=>array('field'=>'Instances.Version','name'=>'Versione','nameEN'=>'Version','type'=>'text'),
 
+	'Instances.UserCount'=>array('field'=>'Instances.UserCount','name'=>'Numero utenti','nameEN'=>'Number of users','type'=>'int'),
 
+	'Instances.StatusCount'=>array('field'=>'Instances.StatusCount','name'=>'Numero stati','nameEN'=>'Number of statuses','type'=>'int'),
 
+	'Instances.DomainCount'=>array('field'=>'Instances.DomainCount','name'=>'Numero istanze note','nameEN'=>'Number of known instances','type'=>'int'),
 
+	'Instances.ActiveUsersMonth'=>array('field'=>'Instances.ActiveUsersMonth','name'=>'Numero utenti attivi (mese)','nameEN'=>'Number of active users (month)','type'=>'int'),
 
+	'Instances.ActiveUsersHalfYear'=>array('field'=>'Instances.ActiveUsersHalfYear','name'=>'Numero utenti attivi (6 mesi)','nameEN'=>'Number of active users (6 months)','type'=>'int'),
 
+	'Instances.Thumb'=>array('field'=>'Instances.Thumb','name'=>'Logo','nameEN'=>'Logo','type'=>'text','search'=>false,'ord'=>false),
 
+	'Instances.RegOpen'=>array('field'=>'Instances.RegOpen','name'=>'Registrazioni aperte','nameEN'=>'Opened registrations','type'=>'bool'),
 
+	'Instances.RegReqApproval'=>array('field'=>'Instances.RegReqApproval','name'=>'Approvazione registrazioni','nameEN'=>'Registrations approval','type'=>'bool'),
 
+	'Instances.MaxTootChars'=>array('field'=>'Instances.MaxTootChars','name'=>'Limite caratteri','nameEN'=>'Max chars per toot','type'=>'int'),
 
+	'Instances.AdmAccount'=>array('field'=>'Instances.AdmAccount','name'=>'Account admin','nameEN'=>'Admin account','type'=>'text'),
 
+	'Instances.AdmDisplayName'=>array('field'=>'Instances.AdmDisplayName','name'=>'Nome account admin','nameEN'=>'Admin display name','type'=>'text'),
 
+	'Instances.AdmCreatedAt'=>array('field'=>'Instances.AdmCreatedAt','name'=>'Data creazione account admin','nameEN'=>'Date and time of admin account creation','type'=>'time'),
 
+	'Instances.AdmURL'=>array('field'=>'Instances.AdmURL','name'=>'Pagina dell’admin','nameEN'=>'Admin’s page','type'=>'text','search'=>false,'ord'=>false),
 
+	'Instances.AdmAvatar'=>array('field'=>'Instances.AdmAvatar','name'=>'Avatar admin','nameEN'=>'Admin’s avatar','type'=>'text','search'=>false,'ord'=>false),
 
+	'Instances.AdmNote'=>array('field'=>'Instances.AdmNote','name'=>'Note dell’admin','nameEN'=>'Admin’s notes','type'=>'text'),
 
 
 //--------------------------------
 
 
-	'InstLangs'=>array('name'=>'Lingue dichiarate','search'=>false,'ord'=>false),
 
+	'InstLangs'=>array('name'=>'Lingue dichiarate','nameEN'=>'Declared languages','search'=>false,'ord'=>false),
 
 
-	'InstLangs.LangID'=>array('field'=>'InstLangs%.LangID','name'=>'Una lingua dichiarata ►','type'=>'join','join'=>array('InstLangs AS InstLangs% ON InstLangs%.InstID=Instances.ID'),'ord'=>false),
 
+	'InstLangs.LangID'=>array('field'=>'InstLangs%.LangID','name'=>'Una lingua dichiarata ►','nameEN'=>'One declared language ►','type'=>'join','join'=>array('InstLangs AS InstLangs% ON InstLangs%.InstID=Instances.ID'),'ord'=>false),
 
 
-	'Languages.NameXX'=>array('field'=>'Languages%.Name'.$dlang,'name'=>'Una lingua dichiarata','type'=>'joini','join'=>array('InstLangs AS InstLangs% ON InstLangs%.InstID=Instances.ID','Languages AS Languages% ON Languages%.ID=InstLangs%.LangID'),'subtype'=>'text','ord'=>true,'ordname'=>'Lingue dichiarate','ordjoin'=>array('InstLangs AS OrdInstLangs ON OrdInstLangs.InstID=Instances.ID','Languages AS OrdLanguages ON OrdLanguages.ID=OrdInstLangs.LangID'),'ordselmore'=>'GROUP_CONCAT(OrdLanguages.Name'.$dlang.' ORDER BY OrdInstLangs.Pos ASC SEPARATOR \'\') AS xOrdLangs','ordby'=>'xOrdLangs'),
 
+	'Languages.NameXX'=>array('field'=>'Languages%.Name'.$dlang,'name'=>'Una lingua dichiarata','nameEN'=>'One declared language','type'=>'joini','join'=>array('InstLangs AS InstLangs% ON InstLangs%.InstID=Instances.ID','Languages AS Languages% ON Languages%.ID=InstLangs%.LangID'),'subtype'=>'text','ord'=>true,'ordname'=>'Lingue dichiarate','ordjoin'=>array('InstLangs AS OrdInstLangs ON OrdInstLangs.InstID=Instances.ID','Languages AS OrdLanguages ON OrdLanguages.ID=OrdInstLangs.LangID'),'ordselmore'=>'GROUP_CONCAT(OrdLanguages.Name'.$dlang.' ORDER BY OrdInstLangs.Pos ASC SEPARATOR \'\') AS xOrdLangs','ordby'=>'xOrdLangs'),
 
 
-	'InstLangs.LangID.First'=>array('field'=>'InstLangs.LangID','name'=>'Lingua primaria dichiarata ►','type'=>'join','join'=>array('InstLangs AS InstLangs ON InstLangs.InstID=Instances.ID AND InstLangs.Pos=1'),'ord'=>false),
 
+	'InstLangs.LangID.First'=>array('field'=>'InstLangs.LangID','name'=>'Lingua primaria dichiarata ►','nameEN'=>'Primary declared language ►','type'=>'join','join'=>array('InstLangs AS InstLangs ON InstLangs.InstID=Instances.ID AND InstLangs.Pos=1'),'ord'=>false),
 
 
-	'Languages.NameXX.First'=>array('field'=>'Languages.Name'.$dlang,'name'=>'Lingua primaria dichiarata','type'=>'joini','join'=>array('InstLangs AS InstLangs ON InstLangs.InstID=Instances.ID AND InstLangs.Pos=1','Languages AS Languages ON Languages.ID=InstLangs.LangID'),'subtype'=>'text','ord'=>false),
 
+	'Languages.NameXX.First'=>array('field'=>'Languages.Name'.$dlang,'name'=>'Lingua primaria dichiarata','nameEN'=>'Primaria declared language','type'=>'joini','join'=>array('InstLangs AS InstLangs ON InstLangs.InstID=Instances.ID AND InstLangs.Pos=1','Languages AS Languages ON Languages.ID=InstLangs.LangID'),'subtype'=>'text','ord'=>false),
 
 
 //--------------------------------
 
 
-	'InstOurLangs'=>array('name'=>'[Lingue impostate da noi]','search'=>false,'ord'=>false),
 
+	'InstOurLangs'=>array('name'=>'[Lingue impostate da noi]','nameEN'=>'[Languages defined by us]','search'=>false,'ord'=>false),
 
 
-	'InstOurLangs.OurLangID'=>array('field'=>'InstOurLangs%.OurLangID','name'=>'[Una lingua impostata da noi] ►','type'=>'join','join'=>array('InstOurLangs AS InstOurLangs% ON InstOurLangs%.InstID=Instances.ID'),'ord'=>false),
 
+	'InstOurLangs.OurLangID'=>array('field'=>'InstOurLangs%.OurLangID','name'=>'[Una lingua impostata da noi] ►','nameEN'=>'[One of the languages defined by us] ►','type'=>'join','join'=>array('InstOurLangs AS InstOurLangs% ON InstOurLangs%.InstID=Instances.ID'),'ord'=>false),
 
 
-	'OurLanguages.NameXX'=>array('field'=>'OurLanguages%.Name'.$dlang,'name'=>'[Una lingua impostata da noi]','type'=>'joini','join'=>array('InstOurLangs AS InstOurLangs% ON InstOurLangs%.InstID=Instances.ID','Languages AS OurLanguages% ON OurLanguages%.ID=InstOurLangs%.OurLangID'),'subtype'=>'text','ord'=>true,'ordname'=>'Lingue impostate da noi','ordjoin'=>array('InstOurLangs AS OrdInstOurLangs ON OrdInstOurLangs.InstID=Instances.ID','Languages AS OrdOurLanguages ON OrdOurLanguages.ID=OrdInstOurLangs.OurLangID'),'ordselmore'=>'GROUP_CONCAT(OrdOurLanguages.Name'.$dlang.' ORDER BY OrdInstOurLangs.Pos ASC SEPARATOR \'\') AS xOrdOurLangs','ordby'=>'xOrdOurLangs'),
 
+	'OurLanguages.NameXX'=>array('field'=>'OurLanguages%.Name'.$dlang,'name'=>'[Una lingua impostata da noi]','nameEN'=>'[One of the languages defined by us]','type'=>'joini','join'=>array('InstOurLangs AS InstOurLangs% ON InstOurLangs%.InstID=Instances.ID','Languages AS OurLanguages% ON OurLanguages%.ID=InstOurLangs%.OurLangID'),'subtype'=>'text','ord'=>true,'ordname'=>'Lingue impostate da noi','ordjoin'=>array('InstOurLangs AS OrdInstOurLangs ON OrdInstOurLangs.InstID=Instances.ID','Languages AS OrdOurLanguages ON OrdOurLanguages.ID=OrdInstOurLangs.OurLangID'),'ordselmore'=>'GROUP_CONCAT(OrdOurLanguages.Name'.$dlang.' ORDER BY OrdInstOurLangs.Pos ASC SEPARATOR \'\') AS xOrdOurLangs','ordby'=>'xOrdOurLangs'),
 
 
-	'InstOurLangs.OurLangID.First'=>array('field'=>'InstOurLangs.OurLangID','name'=>'[Lingua primaria impostata da noi] ►','type'=>'join','join'=>array('InstOurLangs AS InstOurLangs ON InstOurLangs.InstID=Instances.ID AND InstOurLangs.Pos=1'),'ord'=>false),
 
+	'InstOurLangs.OurLangID.First'=>array('field'=>'InstOurLangs.OurLangID','name'=>'[Lingua primaria impostata da noi] ►','nameEN'=>'[Primary language defined by us] ►','type'=>'join','join'=>array('InstOurLangs AS InstOurLangs ON InstOurLangs.InstID=Instances.ID AND InstOurLangs.Pos=1'),'ord'=>false),
 
 
-	'OurLanguages.NameXX.First'=>array('field'=>'OurLanguages.Name'.$dlang,'name'=>'[Lingua primaria impostata da noi]','type'=>'joini','join'=>array('InstOurLangs AS InstOurLangs ON InstOurLangs.InstID=Instances.ID AND InstOurLangs.Pos=1','Languages AS OurLanguages ON OurLanguages.ID=InstOurLangs.OurLangID'),'subtype'=>'text','ord'=>false),
 
+	'OurLanguages.NameXX.First'=>array('field'=>'OurLanguages.Name'.$dlang,'name'=>'[Lingua primaria impostata da noi]','nameEN'=>'[Primary language defined by us]','type'=>'joini','join'=>array('InstOurLangs AS InstOurLangs ON InstOurLangs.InstID=Instances.ID AND InstOurLangs.Pos=1','Languages AS OurLanguages ON OurLanguages.ID=InstOurLangs.OurLangID'),'subtype'=>'text','ord'=>false),
 
 
-	'Instances.OurLangsLock'=>array('field'=>'Instances.OurLangsLock','name'=>'[Blocco lingue impostate da noi]','type'=>'bool'),
 
+	'Instances.OurLangsLock'=>array('field'=>'Instances.OurLangsLock','name'=>'[Blocco lingue impostate da noi]','nameEN'=>'[Lock on languages defined by us]','type'=>'bool'),
 
 
 //--------------------------------
 
 
-	'InstFinancing'=>array('name'=>'[Modalità di finanziamento]','search'=>false,'ord'=>false),
 
+	'InstFinancing'=>array('name'=>'[Modalità di finanziamento]','nameEN'=>'[Financing methods]','search'=>false,'ord'=>false),
 
 
-	'InstFinancing.FinID'=>array('field'=>'InstFinancing%.FinID','name'=>'[Una modalità di finanziamento] ►','type'=>'join','join'=>array('InstFinancing AS InstFinancing% ON InstFinancing%.InstID=Instances.ID'),'ord'=>false),
 
+	'InstFinancing.FinID'=>array('field'=>'InstFinancing%.FinID','name'=>'[Una modalità di finanziamento] ►','nameEN'=>'[One financing method] ►','type'=>'join','join'=>array('InstFinancing AS InstFinancing% ON InstFinancing%.InstID=Instances.ID'),'ord'=>false),
 
 
-	'Financing.Type'=>array('field'=>'Financing%.Type','name'=>'[Una modalità di finanziamento]','type'=>'joini','join'=>array('InstFinancing AS InstFinancing% ON InstFinancing%.InstID=Instances.ID','Financing AS Financing% ON Financing%.ID=InstFinancing%.FinID'),'subtype'=>'text','ord'=>true,'ordname'=>'Modalità di finanziamento','ordjoin'=>array('InstFinancing AS OrdInstFinancing ON OrdInstFinancing.InstID=Instances.ID','Financing AS OrdFinancing ON OrdFinancing.ID=OrdInstFinancing.FinID'),'ordselmore'=>'GROUP_CONCAT(OrdFinancing.Type ORDER BY OrdInstFinancing.Pos ASC SEPARATOR \'\') AS xOrdFinancing','ordby'=>'xOrdFinancing'),
 
+	'Financing.Type'=>array('field'=>'Financing%.Type','name'=>'[Una modalità di finanziamento]','nameEN'=>'[One financing method]','type'=>'joini','join'=>array('InstFinancing AS InstFinancing% ON InstFinancing%.InstID=Instances.ID','Financing AS Financing% ON Financing%.ID=InstFinancing%.FinID'),'subtype'=>'text','ord'=>true,'ordname'=>'Modalità di finanziamento','ordjoin'=>array('InstFinancing AS OrdInstFinancing ON OrdInstFinancing.InstID=Instances.ID','Financing AS OrdFinancing ON OrdFinancing.ID=OrdInstFinancing.FinID'),'ordselmore'=>'GROUP_CONCAT(OrdFinancing.Type ORDER BY OrdInstFinancing.Pos ASC SEPARATOR \'\') AS xOrdFinancing','ordby'=>'xOrdFinancing'),
 
 
-	'InstFinancing.FinID.First'=>array('field'=>'InstFinancing.FinID','name'=>'[Modalità di finanziamento primaria] ►','type'=>'join','join'=>array('InstFinancing AS InstFinancing ON InstFinancing.InstID=Instances.ID AND InstFinancing.Pos=1'),'ord'=>false),
 
+	'InstFinancing.FinID.First'=>array('field'=>'InstFinancing.FinID','name'=>'[Modalità di finanziamento primaria] ►','nameEN'=>'[Primary financing method] ►','type'=>'join','join'=>array('InstFinancing AS InstFinancing ON InstFinancing.InstID=Instances.ID AND InstFinancing.Pos=1'),'ord'=>false),
 
 
-	'Financing.Type.First'=>array('field'=>'Financing.Type','name'=>'[Modalità di finanziamento primaria]','type'=>'joini','join'=>array('InstFinancing AS InstFinancing ON InstFinancing.InstID=Instances.ID AND InstFinancing.Pos=1','Financing AS Financing ON Financing.ID=InstFinancing.FinID'),'subtype'=>'text','ord'=>false),
 
+	'Financing.Type.First'=>array('field'=>'Financing.Type','name'=>'[Modalità di finanziamento primaria]','nameEN'=>'[Primary financing method]','type'=>'joini','join'=>array('InstFinancing AS InstFinancing ON InstFinancing.InstID=Instances.ID AND InstFinancing.Pos=1','Financing AS Financing ON Financing.ID=InstFinancing.FinID'),'subtype'=>'text','ord'=>false),
 
 
 //--------------------------------
 
 
-	'InstPolicies'=>array('name'=>'[Policies]','search'=>false,'ord'=>false),
 
+	'InstPolicies'=>array('name'=>'[Policies]','nameEN'=>'[Policies]','search'=>false,'ord'=>false),
 
 
-	'InstPolicies.PolID'=>array('field'=>'InstPolicies%.PolID','name'=>'[Una policy] ►','type'=>'join','join'=>array('InstPolicies AS InstPolicies% ON InstPolicies%.InstID=Instances.ID'),'ord'=>false),
 
+	'InstPolicies.PolID'=>array('field'=>'InstPolicies%.PolID','name'=>'[Una policy] ►','nameEN'=>'[One policy] ►','type'=>'join','join'=>array('InstPolicies AS InstPolicies% ON InstPolicies%.InstID=Instances.ID'),'ord'=>false),
 
 
-	'Policies.Name'=>array('field'=>'Policies%.Name','name'=>'[Una policy]','type'=>'joini','join'=>array('InstPolicies AS InstPolicies% ON InstPolicies%.InstID=Instances.ID','Policies AS Policies% ON Policies%.ID=InstPolicies%.PolID'),'subtype'=>'text','ord'=>true,'ordname'=>'Policies','ordjoin'=>array('InstPolicies AS OrdInstPolicies ON OrdInstPolicies.InstID=Instances.ID','Policies AS OrdPolicies ON OrdPolicies.ID=OrdInstPolicies.PolID'),'ordselmore'=>'GROUP_CONCAT(OrdPolicies.Name ORDER BY OrdInstPolicies.Pos ASC SEPARATOR \'\') AS xOrdPolicies','ordby'=>'xOrdPolicies'),
 
+	'Policies.Name'=>array('field'=>'Policies%.Name','name'=>'[Una policy]','nameEN'=>'[One policy]','type'=>'joini','join'=>array('InstPolicies AS InstPolicies% ON InstPolicies%.InstID=Instances.ID','Policies AS Policies% ON Policies%.ID=InstPolicies%.PolID'),'subtype'=>'text','ord'=>true,'ordname'=>'Policies','ordjoin'=>array('InstPolicies AS OrdInstPolicies ON OrdInstPolicies.InstID=Instances.ID','Policies AS OrdPolicies ON OrdPolicies.ID=OrdInstPolicies.PolID'),'ordselmore'=>'GROUP_CONCAT(OrdPolicies.Name ORDER BY OrdInstPolicies.Pos ASC SEPARATOR \'\') AS xOrdPolicies','ordby'=>'xOrdPolicies'),
 
 
 // Questi qui sotto sono disabilitati perché le policy non sono "pesate"
 
-	/*'InstPolicies.PolID.First'=>array('field'=>'InstPolicies.PolID','name'=>'[Policy primaria] ►','type'=>'join','join'=>array('InstPolicies AS InstPolicies ON InstPolicies.InstID=Instances.ID AND InstPolicies.Pos=1'),'ord'=>false),
 
+	/*'InstPolicies.PolID.First'=>array('field'=>'InstPolicies.PolID','name'=>'[Policy primaria] ►','nameEN'=>'[Primary policy] ►','type'=>'join','join'=>array('InstPolicies AS InstPolicies ON InstPolicies.InstID=Instances.ID AND InstPolicies.Pos=1'),'ord'=>false),
 
 
-	'Policies.Name.First'=>array('field'=>'Policies.Name','name'=>'[Policy primaria]','type'=>'joini','join'=>array('InstPolicies AS InstPolicies ON InstPolicies.InstID=Instances.ID AND InstPolicies.Pos=1','Policies AS Policies ON Policies.ID=InstPolicies.PolID'),'subtype'=>'text','ord'=>false),*/
 
+	'Policies.Name.First'=>array('field'=>'Policies.Name','name'=>'[Policy primaria]','nameEN'=>'[Primary policy]','type'=>'joini','join'=>array('InstPolicies AS InstPolicies ON InstPolicies.InstID=Instances.ID AND InstPolicies.Pos=1','Policies AS Policies ON Policies.ID=InstPolicies.PolID'),'subtype'=>'text','ord'=>false),*/
 
 
 //--------------------------------
 
 
-	'InstTags'=>array('name'=>'[Tags]','search'=>false,'ord'=>false),
 
+	'InstTags'=>array('name'=>'[Categorie]','nameEN'=>'[Categories]','search'=>false,'ord'=>false),
 
 
-	'InstTags.TagID'=>array('field'=>'InstTags%.TagID','name'=>'[Una tag] ►','type'=>'join','join'=>array('InstTags AS InstTags% ON InstTags%.InstID=Instances.ID'),'ord'=>false),
 
+	'InstTags.TagID'=>array('field'=>'InstTags%.TagID','name'=>'[Una categoria] ►','nameEN'=>'[One category] ►','type'=>'join','join'=>array('InstTags AS InstTags% ON InstTags%.InstID=Instances.ID'),'ord'=>false),
 
 
-	'Tags.Name'=>array('field'=>'Tags%.Name','name'=>'[Una tag]','type'=>'joini','join'=>array('InstTags AS InstTags% ON InstTags%.InstID=Instances.ID','Tags AS Tags% ON Tags%.ID=InstTags%.TagID'),'subtype'=>'text','ord'=>true,'ordname'=>'Tags','ordjoin'=>array('InstTags AS OrdInstTags ON OrdInstTags.InstID=Instances.ID','Tags AS OrdTags ON OrdTags.ID=OrdInstTags.TagID'),'ordselmore'=>'GROUP_CONCAT(OrdTags.Name ORDER BY OrdInstTags.Pos ASC SEPARATOR \'\') AS xOrdTags','ordby'=>'xOrdTags'),
 
+	'Tags.Name'=>array('field'=>'Tags%.Name','name'=>'[Una tag]','nameEN'=>'[One category]','type'=>'joini','join'=>array('InstTags AS InstTags% ON InstTags%.InstID=Instances.ID','Tags AS Tags% ON Tags%.ID=InstTags%.TagID'),'subtype'=>'text','ord'=>true,'ordname'=>'Tags','ordjoin'=>array('InstTags AS OrdInstTags ON OrdInstTags.InstID=Instances.ID','Tags AS OrdTags ON OrdTags.ID=OrdInstTags.TagID'),'ordselmore'=>'GROUP_CONCAT(OrdTags.Name ORDER BY OrdInstTags.Pos ASC SEPARATOR \'\') AS xOrdTags','ordby'=>'xOrdTags'),
 
 
-	'InstTags.TagID.First'=>array('field'=>'InstTags.TagID','name'=>'[Tag primaria] ►','type'=>'join','join'=>array('InstTags AS InstTags ON InstTags.InstID=Instances.ID AND InstTags.Pos=1'),'ord'=>false),
 
+	'InstTags.TagID.First'=>array('field'=>'InstTags.TagID','name'=>'[Tag primaria] ►','nameEN'=>'[Primary category] ►','type'=>'join','join'=>array('InstTags AS InstTags ON InstTags.InstID=Instances.ID AND InstTags.Pos=1'),'ord'=>false),
 
 
-	'Tags.Name.First'=>array('field'=>'Tags.Name','name'=>'[Tag primaria]','type'=>'joini','join'=>array('InstTags AS InstTags ON InstTags.InstID=Instances.ID AND InstTags.Pos=1','Tags AS Tags ON Tags.ID=InstTags.TagID'),'subtype'=>'text','ord'=>false),
 
+	'Tags.Name.First'=>array('field'=>'Tags.Name','name'=>'[Tag primaria]','nameEN'=>'[Primary category]','type'=>'joini','join'=>array('InstTags AS InstTags ON InstTags.InstID=Instances.ID AND InstTags.Pos=1','Tags AS Tags ON Tags.ID=InstTags.TagID'),'subtype'=>'text','ord'=>false),
 
 
 //--------------------------------
 
 
-	'InstActivity.Statuses.First'=>array('field'=>'InstActivity.Statuses','name'=>'Stati ultima settimana','type'=>'joini','join'=>array('InstActivity AS InstActivity ON InstActivity.InstID=Instances.ID AND InstActivity.Pos=1'),'subtype'=>'int','ord'=>true,'ordjoin'=>array('InstActivity AS OrdInstActivity ON OrdInstActivity.InstID=Instances.ID AND OrdInstActivity.Pos=1'),'ordselmore'=>1,'ordby'=>'OrdInstActivity.Statuses'),
 
+	'InstActivity.Statuses.First'=>array('field'=>'InstActivity.Statuses','name'=>'Stati ultima settimana','nameEN'=>'Last week’s statuses number','type'=>'joini','join'=>array('InstActivity AS InstActivity ON InstActivity.InstID=Instances.ID AND InstActivity.Pos=1'),'subtype'=>'int','ord'=>true,'ordjoin'=>array('InstActivity AS OrdInstActivity ON OrdInstActivity.InstID=Instances.ID AND OrdInstActivity.Pos=1'),'ordselmore'=>1,'ordby'=>'OrdInstActivity.Statuses'),
 
 
-	'InstActivity.Logins.First'=>array('field'=>'InstActivity.Logins','name'=>'Logins ultima settimana','type'=>'joini','join'=>array('InstActivity AS InstActivity ON InstActivity.InstID=Instances.ID AND InstActivity.Pos=1'),'subtype'=>'int','ord'=>true,'ordjoin'=>array('InstActivity AS OrdInstActivity ON OrdInstActivity.InstID=Instances.ID AND OrdInstActivity.Pos=1'),'ordselmore'=>1,'ordby'=>'OrdInstActivity.Logins'),
 
+	'InstActivity.Logins.First'=>array('field'=>'InstActivity.Logins','name'=>'Logins ultima settimana','nameEN'=>'Last week’s logins number','type'=>'joini','join'=>array('InstActivity AS InstActivity ON InstActivity.InstID=Instances.ID AND InstActivity.Pos=1'),'subtype'=>'int','ord'=>true,'ordjoin'=>array('InstActivity AS OrdInstActivity ON OrdInstActivity.InstID=Instances.ID AND OrdInstActivity.Pos=1'),'ordselmore'=>1,'ordby'=>'OrdInstActivity.Logins'),
 
 
-	'IntstActivity.Registrations.First'=>array('field'=>'InstActivity.Registrations','name'=>'Registrazioni ultima settimana','type'=>'joini','join'=>array('InstActivity AS InstActivity ON InstActivity.InstID=Instances.ID AND InstActivity.Pos=1'),'subtype'=>'int','ord'=>true,'ordjoin'=>array('InstActivity AS OrdInstActivity ON OrdInstActivity.InstID=Instances.ID AND OrdInstActivity.Pos=1'),'ordselmore'=>1,'ordby'=>'OrdInstActivity.Registrations'),
 
+	'IntstActivity.Registrations.First'=>array('field'=>'InstActivity.Registrations','name'=>'Registrazioni ultima settimana','nameEN'=>'Last week’s registrations nukmber','type'=>'joini','join'=>array('InstActivity AS InstActivity ON InstActivity.InstID=Instances.ID AND InstActivity.Pos=1'),'subtype'=>'int','ord'=>true,'ordjoin'=>array('InstActivity AS OrdInstActivity ON OrdInstActivity.InstID=Instances.ID AND OrdInstActivity.Pos=1'),'ordselmore'=>1,'ordby'=>'OrdInstActivity.Registrations'),
 
 
 //--------------------------------

+ 95 - 70
web/mustard/include/dispinst.php
View File 

@@ -3,7 +3,23 @@
 
 use function mysqli_real_escape_string as myesc;
 
 
 // serve per i vari strftime - quando ci sarà versione inglese andrebbe impostata a en_EN.utf8, alla bisogna
 
-setlocale(LC_ALL,'it_IT.utf8');
 
+(isset($english) && $english) ? setlocale(LC_ALL,'en_EN.utf8') : setlocale(LC_ALL,'it_IT.utf8');
 
+
 
+function t($itstr,$enstr) {
 
+	global $english;
 
+	if (!$english)
 
+		return($itstr);
 
+	else
 
+		return($enstr);
 
+}
 
+
 
+function tc($key) {
 
+	global $english, $cols;
 
+	if (!$english)
 
+		return($cols[$key]['name']);
 
+	else
 
+		return($cols[$key]['nameEN']);
 
+}
 
 
 function nully($val,$fem,$filter,$ntext=null) {
 
 	if (!is_null($val)) {
 
@@ -21,12 +37,12 @@ function nully($val,$fem,$filter,$ntext=null) {
 
 			return('<img src="'.str_replace('"','\\"',strip_tags($val)).'">');
 
 		} elseif ($filter=='boolt') {
 
 			if ($val)
 
-				return('<span class="good">Si</span>');
 
+				return('<span class="good">'.t('Si','Yes').'</span>');
 
 			else
 
 				return('<span class="bad">No</span>');
 
 		} elseif ($filter=='boolf') {
 
 			if ($val)
 
-				return('<span class="bad">Si</span>');
 
+				return('<span class="bad">'.t('Si','Yes').'</span>');
 
 			else
 
 				return('<span class="good">No</span>');
 
 		} else {
 
@@ -35,9 +51,9 @@ function nully($val,$fem,$filter,$ntext=null) {
 
 	} else {
 
 		if (is_null($ntext)) {
 
 			if ($fem)
 
-				return('<span class="nully">Non definita</span>');
 
+				return('<span class="nully">'.t('Non definita','Not defined').'</span>');
 
 			else
 
-				return('<span class="nully">Non definito</span>');
 
+				return('<span class="nully">'.t('Non definito','Not defined').'</span>');
 
 			}
 
 		else {
 
 			return('<span class="nully">'.$ntext.'</span>');
 
@@ -56,7 +72,7 @@ function booly($pre,$val,$nottoobad=false,$invcol=false) {
 
 				$p='<p class="neut">';
 
 			}
 
 		}
 
-		return($p.$pre.'SI</p>');
 
+		return($p.$pre.t('SI','YES').'</p>');
 
 	} else {
 
 		if (!$invcol) {
 
 			if (!$nottoobad) {
 
@@ -84,7 +100,7 @@ function dispinst(&$row,&$cols,&$link,&$dlang,&$account,$showcount,$finst,$cinst
 
 	$out.='<tr><td colspan="2" class="insthead">'.$row['URI'];
 
 	if ($showcount) $out.=' ('.$finst.'/'.$cinsts.')';
 
 	$out.='</td></tr>'.N;
 
-	$out.='<tr><td colspan="2"><input type="button" value="Edita" class="btbut" onclick="document.location.href=\'edinst.php?id='.$row['IID'].'\'"></td></tr>'.N;
 
+	$out.='<tr><td colspan="2"><input type="button" value="'.t('Edita','Edit').'" class="btbut" onclick="document.location.href=\'edinst.php?id='.$row['IID'].'\'"></td></tr>'.N;
 
 	if ($account['Level']!='guest') {
 
 		if (!is_null($row['GuestID'])) {
 
 			$out.='<tr><td colspan="2"><input type="button" value="Sollecita, stimola, incalza, incita admin già invitat*" class="btbut" onclick="document.location.href=\'invite.php?id='.$row['IID'].'\'"></td></tr>'.N;
 
@@ -94,13 +110,13 @@ function dispinst(&$row,&$cols,&$link,&$dlang,&$account,$showcount,$finst,$cinst
 
 			$out.='<tr><td colspan="2"><input type="button" value="Invita admin" class="btbut" onclick="document.location.href=\'invite.php?id='.$row['IID'].'\'"></td></tr>'.N;
 
 		}
 
 	}
 
-	$attr=booly(trimname($cols['Instances.Blacklisted']['name']).': ',$row['Blacklisted'],false,true).N;
 
-	$attr.=booly(trimname($cols['Instances.New']['name']).': ',$row['New'],true).N;
 
-	$attr.=booly(trimname($cols['Instances.Good']['name']).': ',$row['Good']).N;
 
-	$attr.=booly(trimname($cols['Instances.Chosen']['name']).': ',$row['Chosen']).N;
 
-	$attr.=booly(trimname($cols['Instances.Visible']['name']).': ',$row['Visible']).N;
 
-	/*$attr.=booly($cols['Instances.RegOpen']['name'].': ',$row['RegOpen']).N;
 
-	$attr.=booly($cols['Instances.RegReqApproval']['name'].': ',$row['RegReqApproval'],true,true).N;*/
 
+	$attr=booly(trimname(tc('Instances.Blacklisted')).': ',$row['Blacklisted'],false,true).N;
 
+	$attr.=booly(trimname(tc('Instances.New')).': ',$row['New'],true).N;
 
+	$attr.=booly(trimname(tc('Instances.Good')).': ',$row['Good']).N;
 
+	$attr.=booly(trimname(tc('Instances.Chosen')).': ',$row['Chosen']).N;
 
+	$attr.=booly(trimname(tc('Instances.Visible')).': ',$row['Visible']).N;
 
+	/*$attr.=booly(tc('Instances.RegOpen')).': ',$row['RegOpen']).N;
 
+	$attr.=booly(tc('Instances.RegReqApproval').': ',$row['RegReqApproval'],true,true).N;*/
 
 	$sres=mysqli_query($link,'SELECT * FROM InstChecks WHERE InstID='.$row['IID'].' ORDER BY Time DESC')
 
 		or muoribene(mysqli_error($link),true);
 
 	$csres=mysqli_num_rows($sres);
 
@@ -111,36 +127,36 @@ function dispinst(&$row,&$cols,&$link,&$dlang,&$account,$showcount,$finst,$cinst
 
 				$bene++;
 
 		}
 
 		$width=str_replace(',','.',100/$csres*$bene);
 
-		$attr.='<div class="colsectheader">Percentuale di risposta ai nostri check ('.$csres.'): '.round($width,1).'%</div>';
 
+		$attr.='<div class="colsectheader">'.t('Percentuale di risposta ai nostri check','Percentage of response to our checks').' ('.$csres.'): '.round($width,1).'%</div>';
 
 		$attr.='<div class="percbg"><div class="percfg" style="width:'.$width.'%;"></div></div>'.N;
 
 		mysqli_data_seek($sres,0);
 
 		$srow=mysqli_fetch_assoc($sres);
 
-		$attr.='<div class="colsectcont">Ultimo check '.strftime('%e %b %Y, %T',$srow['Time']).': '.(($srow['Status']) ? '<span class="good">OK</span>' : '<span class="bad">KO</span>').'</div>';
 
+		$attr.='<div class="colsectcont">'.t('Ultimo check','Last check').'<br>('.strftime('%c',$srow['Time']).'): '.(($srow['Status']) ? '<span class="good">OK</span>' : '<span class="bad">KO</span>').'</div>';
 
 	} else {
 
-		$attr.='<div class="colsectheader">Percentuale di risposta ai nostri check</div>'.N;
 
-		$attr.='<div class="colsectcont nully">Non disponibile (?!?!?!)</div>'.N;
 
+		$attr.='<div class="colsectheader">'.t('Percentuale di risposta ai nostri check','Percentage of response to our checks').'</div>'.N;
 
+		$attr.='<div class="colsectcont nully">'.t('Non disponibile','Unavailable').' (?!?!?!)</div>'.N;
 
 	}
 
-	$attr.='<div class="colsectheader">Attività delle ultime 12 settimane</div>'.N;
 
+	$attr.='<div class="colsectheader">'.t('Attività delle ultime 12 settimane','Last 12 weeks activity').'</div>'.N;
 
 	$sres=mysqli_query($link,'SELECT SUM(Statuses) AS tstatuses, SUM(Logins) AS tlogins, SUM(Registrations) AS tregs FROM InstActivity WHERE InstID='.$row['IID'])
 
 		or muoribene(mysqli_error($link),true);
 
 	$tot=mysqli_fetch_assoc($sres);
 
 	$sres=mysqli_query($link,'SELECT * FROM InstActivity WHERE InstID='.$row['IID'].' ORDER BY Week DESC')
 
 		or muoribene(mysqli_error($link),true);
 
 	if (mysqli_num_rows($sres)>0) {
 
-		$attr.='<div class="colsectcont">Stati: '.$tot['tstatuses'].'<br>Accessi: '.$tot['tlogins'].'<br>Registrazioni: '.$tot['tregs'].'</div>'.N;
 
+		$attr.='<div class="colsectcont">'.t('Stati','Statuses').': '.$tot['tstatuses'].'<br>'.t('Accessi','Logins').': '.$tot['tlogins'].'<br>'.t('Registrazioni','Registrations').': '.$tot['tregs'].'</div>'.N;
 
 		while ($srow=mysqli_fetch_assoc($sres)) {
 
-			$attr.='<div class="colsectcontb">'.strftime('%e %b %Y',$srow['Week']).'</div>'.N;
 
+			$attr.='<div class="colsectcontb">'.strftime(/*'%e %b %Y'*/'%x',$srow['Week']).'</div>'.N;
 
 			($tot['tstatuses']==0) ? $width=0 : $width=str_replace(',','.',100/$tot['tstatuses']*$srow['Statuses']);
 
-			$attr.='<div class="percstatuses" style="width:'.$width.'%;">'.$srow['Statuses'].'&nbsp;stati</div>'.N;
 
+			$attr.='<div class="percstatuses" style="width:'.$width.'%;">'.$srow['Statuses'].'&nbsp;'.t('stati','statuses').'</div>'.N;
 
 			($tot['tlogins']==0) ? $width=0 : $width=str_replace(',','.',100/$tot['tlogins']*$srow['Logins']);
 
-			$attr.='<div class="perclogins" style="width:'.$width.'%;">'.$srow['Logins'].'&nbsp;accessi</div>'.N;
 
+			$attr.='<div class="perclogins" style="width:'.$width.'%;">'.$srow['Logins'].'&nbsp;'.t('accessi','logins').'</div>'.N;
 
 			($tot['tregs']==0) ? $width=0 : $width=str_replace(',','.',100/$tot['tregs']*$srow['Registrations']);
 
-			$attr.='<div class="percregs" style="width:'.$width.'%;">'.$srow['Registrations'].'&nbsp;registrazioni</div>'.N;
 
+			$attr.='<div class="percregs" style="width:'.$width.'%;">'.$srow['Registrations'].'&nbsp;'.t('registrazioni','registrations').'</div>'.N;
 
 		}
 
 	} else {
 
-		$attr.='<div class="colsectcont nully">Non disponibile</div>'.N;
 
+		$attr.='<div class="colsectcont nully">'.t('Non disponibile','Unavailable').'</div>'.N;
 
 	}
 
-	$attr.='<div class="colsectheader">Hashtags più usati durante l’ultima settimana</div>'.N;
 
+	$attr.='<div class="colsectheader">'.t('Hashtags più usati durante l’ultima settimana','Most used hashtags during last week').'</div>'.N;
 
 	$sres=mysqli_query($link,'SELECT * FROM InstTrends WHERE InstID='.$row['IID'].' ORDER BY Pos ASC')
 
 		or muoribene(mysqli_error($link),true);
 
 	if (mysqli_num_rows($sres)>0) {
 
@@ -150,7 +166,7 @@ function dispinst(&$row,&$cols,&$link,&$dlang,&$account,$showcount,$finst,$cinst
 
 		}
 
 		$attr.='</ol></div>'.N;
 
 	} else {
 
-		$attr.='<div class="colsectcont nully">Non disponibili</div>'.N;
 
+		$attr.='<div class="colsectcont nully">'.t('Non disponibili','Unavailable').'</div>'.N;
 
 	}
 
 	$out.='<tr><td class="tdattr">'.$attr.'</td><td>'.N;
 
 	if ($row['Blacklisted']>0) {
 
@@ -159,33 +175,34 @@ function dispinst(&$row,&$cols,&$link,&$dlang,&$account,$showcount,$finst,$cinst
 
 		if (mysqli_num_rows($sres)>0) {
 
 			$srow=mysqli_fetch_assoc($sres);
 
 			if (!is_null($srow['PublicComment']) && preg_match('/^\s*$/',$srow['PublicComment'])!==1) {
 
-				$out.='<div class="baloo">Questa istanza è blacklistata per questo motivo: '.hspech($srow['PublicComment']).'</div>'.N;
 
+				$out.='<div class="baloo">'.t('Questa istanza è blacklistata per questo motivo','This instance is blacklisted for this reason').': '.hspech($srow['PublicComment']).'</div>'.N;
 
 			} else {
 
-				$out.='<div class="baloo">Questa istanza è blacklistata, ma nella blacklist non è specificato il motivo.</div>'.N;
 
+				$out.='<div class="baloo">'.t('Questa istanza è blacklistata, ma nella blacklist non è specificato il motivo','This instance is blacklisted, but the blacklist entry doesn’t specify a reason').'.</div>'.N;
 
 			}
 
 		} else {
 
-			$out.='<div class="baloo">Questa istanza risulta blacklistata nella tabella delle istanze, ma nella tabella “Blacklist” non è presente: probabilmente è stata rimossa dalla tabella “Blacklist” e il crawler non l’ha ancora aggiornata.</div>'.N;
 
+			$out.='<div class="baloo">'.t('Questa istanza risulta blacklistata nella tabella delle istanze, ma nella tabella “Blacklist” non è presente: probabilmente è stata rimossa dalla tabella “Blacklist” e il crawler non l’ha ancora aggiornata','This instance has the “Blacklisted” flag on, but it is not present in the “Blacklist” table: prabably it has been removed from there but the crawler has not yet updated its record').'.</div>'.N;
 
 		}
 
 	}
 
-	$out.='<div class="baloo"><span class="field">'.$cols['Instances.URI']['name'].':</span> <a href="https://'.$row['URI'].'" target="_blank">'.$row['URI'].'</a></div>'.N;
 
-	$out.='<div class="baloo"><span class="field">'.$cols['Instances.Title']['name'].':</span> '.nully($row['Title'],false,'strip').'</div>'.N;
 
-	$out.='<div class="baloo"><span class="field">'.$cols['Instances.Thumb']['name'].':</span> '.nully($row['Thumb'],true,'image').'</div>'.N;
 
-	$out.='<div class="baloo"><span class="field">'.$cols['Instances.ShortDesc']['name'].':</span> '.nully($row['ShortDesc'],true,'strip').'</div>'.N;
 
-	$out.='<div class="baloo"><span class="field">'.$cols['Instances.LongDesc']['name'].':</span> '.nully($row['LongDesc'],true,'strip').'</div>'.N;
 
+	$out.='<div class="baloo"><span class="field">'.tc('Instances.URI').':</span> <a href="https://'.$row['URI'].'" target="_blank">'.$row['URI'].'</a></div>'.N;
 
+	$out.='<div class="baloo"><span class="field">'.tc('Instances.Title').':</span> '.nully($row['Title'],false,'strip').'</div>'.N;
 
+	$out.='<div class="baloo"><span class="field">'.tc('Instances.Thumb').':</span> '.nully($row['Thumb'],true,'image').'</div>'.N;
 
+	$out.='<div class="baloo"><span class="field">'.tc('Instances.ShortDesc').':</span> '.nully($row['ShortDesc'],true,'strip').'</div>'.N;
 
+	$out.='<div class="baloo"><span class="field">'.tc('Instances.LongDesc').':</span> '.nully($row['LongDesc'],true,'strip').'</div>'.N;
 
 // 'strip' o 'htmlent' per la descrizione nostra?
 
-	$out.='<div class="baloo"><span class="ourfield">'.trimname($cols['Instances.OurDesc']['name']).':</span> '.nully($row['OurDesc'],true,'strip').'</div>'.N;
 
-	$out.='<div class="baloo"><span class="ourfield">'.trimname($cols['Instances.OurDescEN']['name']).':</span> '.nully($row['OurDescEN'],true,'strip').'</div>'.N;
 
-	$out.='<div class="baloo"><span class="ourfield">'.trimname($cols['Localities.Name']['name']).':</span> ';
 
+	$out.='<div class="baloo"><span class="ourfield">'.trimname(tc('Instances.OurDesc')).':</span> '.nully($row['OurDesc'],true,'strip').'</div>'.N;
 
+	$out.='<div class="baloo"><span class="ourfield">'.trimname(tc('Instances.OurDescEN')).':</span> '.nully($row['OurDescEN'],true,'strip').'</div>'.N;
 
+	$out.='<div class="baloo"><span class="ourfield">'.trimname(tc('Localities.Name')).':</span> ';
 
 	if (!is_null($row['LocalityID'])) {
 
 		$sres=mysqli_query($link,'SELECT * FROM Localities WHERE Localities.ID='.$row['LocalityID'])
 
 			or muoribene(mysqli_error($link),true);
 
 		$srow=mysqli_fetch_assoc($sres);
 
 		$out.=hspech($srow['NameOrig']).'</div>'.N;
 
 	} else {
 
-		$out.='<span class="nully">Non definita</span></div>'.N;
 
+		$out.='<span class="nully">'.t('Non definita','Undefined').'</span></div>'.N;
 
 	}
 
 	$sres=mysqli_query($link,'SELECT * FROM InstLangs LEFT JOIN Languages ON Languages.ID=LangID WHERE InstID='.$row['IID'].' ORDER BY Pos ASC')
 
 		or muoribene(mysqli_error($link),true);
 
+	$out.='<div class="baloo"><span class="field">'.tc('InstLangs').':</span> ';
 
 	if (mysqli_num_rows($sres)>0) {
 
 		$i=0;
 
 		$buf=array();
 
@@ -193,12 +210,14 @@ function dispinst(&$row,&$cols,&$link,&$dlang,&$account,$showcount,$finst,$cinst
 
 			$i++;
 
 			$buf[]=$i.': '.hspech($srow['Name'.$dlang].' ['.$srow['Code'].']');
 
 		}
 
-		$out.='<div class="baloo"><span class="field">'.$cols['InstLangs']['name'].':</span> '.implode('; ',$buf).'</div>'.N;
 
+		$out.=implode('; ',$buf);
 
 	} else {
 
-		$out.='<div class="baloo"><span class="field">'.$cols['InstLangs']['name'].':</span> <span class="nully">Non definite</span></div>'.N;
 
+		$out.='<span class="nully">'.t('Non definite','Undefined').'</span>';
 
 	}
 
+	$out.='</div>'.N;
 
 	$sres=mysqli_query($link,'SELECT * FROM InstOurLangs LEFT JOIN Languages ON Languages.ID=OurLangID WHERE InstID='.$row['IID'].' ORDER BY Pos ASC')
 
 		or muoribene(mysqli_error($link),true);
 
+	$out.='<div class="baloo"><span class="ourfield">'.trimname(tc('InstOurLangs')).':</span> ';
 
 	if (mysqli_num_rows($sres)>0) {
 
 		$i=0;
 
 		$buf=array();
 
@@ -206,14 +225,15 @@ function dispinst(&$row,&$cols,&$link,&$dlang,&$account,$showcount,$finst,$cinst
 
 			$i++;
 
 			$buf[]=$i.': '.hspech($srow['Name'.$dlang].' ['.$srow['Code'].']');
 
 		}
 
-		$out.='<div class="baloo"><span class="ourfield">'.trimname($cols['InstOurLangs']['name']).':</span> '.implode('; ',$buf);
 
+		$out.=implode('; ',$buf);
 
 	} else {
 
-		$out.='<div class="baloo"><span class="ourfield">'.trimname($cols['InstOurLangs']['name']).':</span> <span class="nully">Non definite</span>';
 
+		$out.='<span class="nully">'.t('Non definite','Undefined').'</span>';
 
 	}
 
-	($row['OurLangsLock']>0) ? $out.=' <strong>(bloccate)</strong>' : $out.=' <strong>(non bloccate)</strong>';
 
+	($row['OurLangsLock']>0) ? $out.=' <strong>('.t('bloccate','locked').')</strong>' : $out.=' <strong>('.t('non bloccate','not locked').')</strong>';
 
 	$out.='</div>'.N;
 
 	$sres=mysqli_query($link,'SELECT * FROM InstFinancing LEFT JOIN Financing ON Financing.ID=FinID WHERE InstID='.$row['IID'].' ORDER BY Pos ASC')
 
 		or muoribene(mysqli_error($link),true);
 
+	$out.='<div class="baloo"><span class="ourfield">'.trimname(tc('InstFinancing')).':</span> ';
 
 	if (mysqli_num_rows($sres)>0) {
 
 		$i=0;
 
 		$buf=array();
 
@@ -221,12 +241,14 @@ function dispinst(&$row,&$cols,&$link,&$dlang,&$account,$showcount,$finst,$cinst
 
 			$i++;
 
 			$buf[]=$i.': '.hspech($srow['Type']);
 
 		}
 
-		$out.='<div class="baloo"><span class="ourfield">'.trimname($cols['InstFinancing']['name']).':</span> '.implode('; ',$buf).'</div>'.N;
 
+		$out.=implode('; ',$buf);
 
 	} else {
 
-		$out.='<div class="baloo"><span class="ourfield">'.trimname($cols['InstFinancing']['name']).':</span> <span class="nully">Non definite</span></div>'.N;
 
+		$out.='<span class="nully">'.t('Non definite','Undefined').'</span>';
 
 	}
 
+	$out.='</div>'.N;
 
 	$sres=mysqli_query($link,'SELECT * FROM InstPolicies LEFT JOIN Policies ON Policies.ID=PolID WHERE InstID='.$row['IID'].' ORDER BY Pos ASC')
 
 		or muoribene(mysqli_error($link),true);
 
+	$out.='<div class="baloo"><span class="ourfield">'.trimname(tc('InstPolicies')).':</span> ';
 
 	if (mysqli_num_rows($sres)>0) {
 
 		$i=0;
 
 		$buf=array();
 
@@ -234,12 +256,14 @@ function dispinst(&$row,&$cols,&$link,&$dlang,&$account,$showcount,$finst,$cinst
 
 			$i++;
 
 			$buf[]=$i.': '.hspech($srow['Name']);
 
 		}
 
-		$out.='<div class="baloo"><span class="ourfield">'.trimname($cols['InstPolicies']['name']).':</span> '.implode('; ',$buf).'</div>'.N;
 
+		$out.=implode('; ',$buf);
 
 	} else {
 
-		$out.='<div class="baloo"><span class="ourfield">'.trimname($cols['InstPolicies']['name']).':</span> <span class="nully">Non definite</span></div>'.N;
 
+		$out.='<span class="nully">'.t('Non definite','Undefined').'</span>';
 
 	}
 
+	$out.='</div>'.N;
 
 	$sres=mysqli_query($link,'SELECT * FROM InstTags LEFT JOIN Tags ON Tags.ID=TagID WHERE InstID='.$row['IID'].' ORDER BY Pos ASC')
 
 		or muoribene(mysqli_error($link),true);
 
+	$out.='<div class="baloo"><span class="ourfield">'.trimname(tc('InstTags')).':</span> ';
 
 	if (mysqli_num_rows($sres)>0) {
 
 		$i=0;
 
 		$buf=array();
 
@@ -247,12 +271,13 @@ function dispinst(&$row,&$cols,&$link,&$dlang,&$account,$showcount,$finst,$cinst
 
 			$i++;
 
 			$buf[]=$i.': '.hspech($srow['Name']);
 
 		}
 
-		$out.='<div class="baloo"><span class="ourfield">'.trimname($cols['InstTags']['name']).':</span> '.implode('; ',$buf).'</div>'.N;
 
+		$out.=implode('; ',$buf);
 
 	} else {
 
-		$out.='<div class="baloo"><span class="ourfield">'.trimname($cols['InstTags']['name']).':</span> <span class="nully">Non definite</span></div>'.N;
 
+		$out.='<span class="nully">'.t('Non definite','Undefined').'</span>';
 
 	}
 
+	$out.='</div>'.N;
 
 	if (!is_null($row['GuestID'])) {
 
-		$guestinf='<span class="good">SI</span>';
 
+		$guestinf='<span class="good">'.t('SI','YES').'</span>';
 
 		$sres=mysqli_query($link,'SELECT Email FROM Admins WHERE ID='.$row['GuestID'])
 
 			or muoribene(__LINE__.': '.mysqli_error($link),true);
 
 		$srow=mysqli_fetch_assoc($sres);
 
@@ -260,25 +285,25 @@ function dispinst(&$row,&$cols,&$link,&$dlang,&$account,$showcount,$finst,$cinst
 
 	} else {
 
 		$guestinf='<span class="bad">NO</span>';
 
 	}
 
-	$out.='<div class="baloo"><span class="ourfield">Admin invitat*?</span> '.$guestinf.'</div>'.N;
 
-	$out.='<div class="baloo"><span class="ourfield">'.trimname($cols['Instances.LastGuestEdit']['name']).':</span> '.nully($row['LastGuestEdit'],true,'timestamp').'</div>'.N;
 
-	$out.='<div class="baloo"><span class="field">'.$cols['Instances.Email']['name'].':</span> '.nully($row['Email'],true,'email').'</div>'.N;
 
-	$out.='<div class="baloo"><span class="field">'.$cols['Instances.Software']['name'].':</span> '.nully($row['Software'],false,'strip').'</div>'.N;
 
-	$out.='<div class="baloo"><span class="field">'.$cols['Instances.Version']['name'].':</span> '.nully($row['Version'],true,'strip').'</div>'.N;
 
-	$out.='<div class="baloo"><span class="field">'.$cols['Instances.UserCount']['name'].':</span> '.nully($row['UserCount'],false,'strip').'</div>'.N;
 
-	$out.='<div class="baloo"><span class="field">'.$cols['Instances.StatusCount']['name'].':</span> '.nully($row['StatusCount'],false,'strip').'</div>'.N;
 
-	$out.='<div class="baloo"><span class="field">'.$cols['Instances.DomainCount']['name'].':</span> '.nully($row['DomainCount'],false,'strip').'</div>'.N;
 
-	$out.='<div class="baloo"><span class="field">'.$cols['Instances.ActiveUsersMonth']['name'].':</span> '.nully($row['ActiveUsersMonth'],false,'strip').'</div>'.N;
 
-	$out.='<div class="baloo"><span class="field">'.$cols['Instances.ActiveUsersHalfYear']['name'].':</span> '.nully($row['ActiveUsersHalfYear'],false,'strip').'</div>'.N;
 
-	$out.='<div class="baloo"><span class="field">'.$cols['Instances.RegOpen']['name'].':</span> '.nully($row['RegOpen'],false,'boolt').'</div>'.N;
 
-	$out.='<div class="baloo"><span class="field">'.$cols['Instances.RegReqApproval']['name'].':</span> '.nully($row['RegReqApproval'],false,'boolf').'</div>'.N;
 
-	$out.='<div class="baloo"><span class="field">'.$cols['Instances.MaxTootChars']['name'].':</span> '.nully($row['MaxTootChars'],false,'strip','500').'</div>'.N;
 
-	$out.='<div class="baloo"><span class="field">'.$cols['Instances.AdmAccount']['name'].':</span> '.nully($row['AdmAccount'],false,'strip').'</div>'.N;
 
-	$out.='<div class="baloo"><span class="field">'.$cols['Instances.AdmDisplayName']['name'].':</span> '.nully($row['AdmDisplayName'],false,'strip').'</div>'.N;
 
-	$out.='<div class="baloo"><span class="field">'.$cols['Instances.AdmCreatedAt']['name'].':</span> '.nully($row['AdmCreatedAt'],true,'timestamp').'</div>'.N;
 
-	$out.='<div class="baloo"><span class="field">'.$cols['Instances.AdmURL']['name'].':</span> '.nully($row['AdmURL'],true,'url').'</div>'.N;
 
-	$out.='<div class="baloo"><span class="field">'.$cols['Instances.AdmAvatar']['name'].':</span> '.nully($row['AdmAvatar'],false,'image').'</div>'.N;
 
-	$out.='<div><span class="field">'.$cols['Instances.AdmNote']['name'].':</span> '.nully($row['AdmNote'],false,'strip').'</div>'.N;
 
+	$out.='<div class="baloo"><span class="ourfield">'.t('Admin invitat*?','Admin has been invited?').'</span> '.$guestinf.'</div>'.N;
 
+	$out.='<div class="baloo"><span class="ourfield">'.trimname(tc('Instances.LastGuestEdit')).':</span> '.nully($row['LastGuestEdit'],true,'timestamp').'</div>'.N;
 
+	$out.='<div class="baloo"><span class="field">'.tc('Instances.Email').':</span> '.nully($row['Email'],true,'email').'</div>'.N;
 
+	$out.='<div class="baloo"><span class="field">'.tc('Instances.Software').':</span> '.nully($row['Software'],false,'strip').'</div>'.N;
 
+	$out.='<div class="baloo"><span class="field">'.tc('Instances.Version').':</span> '.nully($row['Version'],true,'strip').'</div>'.N;
 
+	$out.='<div class="baloo"><span class="field">'.tc('Instances.UserCount').':</span> '.nully($row['UserCount'],false,'strip').'</div>'.N;
 
+	$out.='<div class="baloo"><span class="field">'.tc('Instances.StatusCount').':</span> '.nully($row['StatusCount'],false,'strip').'</div>'.N;
 
+	$out.='<div class="baloo"><span class="field">'.tc('Instances.DomainCount').':</span> '.nully($row['DomainCount'],false,'strip').'</div>'.N;
 
+	$out.='<div class="baloo"><span class="field">'.tc('Instances.ActiveUsersMonth').':</span> '.nully($row['ActiveUsersMonth'],false,'strip').'</div>'.N;
 
+	$out.='<div class="baloo"><span class="field">'.tc('Instances.ActiveUsersHalfYear').':</span> '.nully($row['ActiveUsersHalfYear'],false,'strip').'</div>'.N;
 
+	$out.='<div class="baloo"><span class="field">'.tc('Instances.RegOpen').':</span> '.nully($row['RegOpen'],false,'boolt').'</div>'.N;
 
+	$out.='<div class="baloo"><span class="field">'.tc('Instances.RegReqApproval').':</span> '.nully($row['RegReqApproval'],false,'boolf').'</div>'.N;
 
+	$out.='<div class="baloo"><span class="field">'.tc('Instances.MaxTootChars').':</span> '.nully($row['MaxTootChars'],false,'strip','500').'</div>'.N;
 
+	$out.='<div class="baloo"><span class="field">'.tc('Instances.AdmAccount').':</span> '.nully($row['AdmAccount'],false,'strip').'</div>'.N;
 
+	$out.='<div class="baloo"><span class="field">'.tc('Instances.AdmDisplayName').':</span> '.nully($row['AdmDisplayName'],false,'strip').'</div>'.N;
 
+	$out.='<div class="baloo"><span class="field">'.tc('Instances.AdmCreatedAt').':</span> '.nully($row['AdmCreatedAt'],true,'timestamp').'</div>'.N;
 
+	$out.='<div class="baloo"><span class="field">'.tc('Instances.AdmURL').':</span> '.nully($row['AdmURL'],true,'url').'</div>'.N;
 
+	$out.='<div class="baloo"><span class="field">'.tc('Instances.AdmAvatar').':</span> '.nully($row['AdmAvatar'],false,'image').'</div>'.N;
 
+	$out.='<div><span class="field">'.tc('Instances.AdmNote').':</span> '.nully($row['AdmNote'],false,'strip').'</div>'.N;
 
 	$out.='</td></tr>'.N;
 
 	$out.='</tbody>'.N;
 
 	$out.='</table>'.N;