Many PRs merged & additional fixes

inc/js/photosphere/sphere.js

@@ -13,7 +13,7 @@ function Photosphere(image){
 }
 
 Photosphere.prototype.loadPhotosphere = function(holder){
-	holder.innerHTML = "wait...";
+	holder.innerHTML = "<div id='loading_spin'><img src='inc/spiffygif.gif' alt='Loading...'></div>";
 
 	this.holder = holder;
 

inc/loc/default.ini

@@ -1,31 +1,42 @@
 [settings]
 settings	= "Settings"
+global		= "Global"
 title 		= "Title"
 site_address= "Site root URL"
 buttons 	= "Buttons"
+s_networks	= "Social Networks"
 fb 			= "Facebook"
 facebook_appid 	= "Facebook Application ID"
 fbappid 	= "AppID"
 plusone 	= "Google +1"
 register 	= "Register"
+options		= "Options"
 noregister 	= "Block Registration"
 forcehttps 	= "Force https for login and registration"
 comment		= "Comments"
 nocomment	= "Remove Comments Panel"
 download	= "Downloads"
+nocomments	= "Remove comments"
+nodescription	= "Remove descriptions"
 nodownload 	= "Remove downloading links"
+reverse_menu	= "Reverse menu order"
+rss		= "RSS feed"
+button_title	= "Title for buttons"
 numcomments	= "Number of comments in Admin Stats"
 numcomm 	= "Comments"
 sens 		= "Max number of images displayed when hovering an album"
+thumbs_size	= "Thumbnails size (px)"
 images 		= "Images"
 language	= "Language"
+user_theme	= "Theme"
 submit		= "Submit"
 generate 	= "Generate recursively thumbs and web images"
 folder		= "Folder"
 all			= "All"
 gener		= "Generate"
-video_comment	= "PhotoShow only displays videos in WebM. You can set the encoding to convert to other formats than webm"
-encode_video	= "Encode Video Activate"
+video		= "Video"
+video_comment	= "PhotoShow only displays videos in WebM. You can set the encoding to convert to other formats than webm."
+encode_video	= "Encode Video"
 ffmpeg_path	= "FFmpeg path"
 ffmpeg_option	= "Encoding option"
 
@@ -40,6 +51,7 @@ oldpass		= "Old Pass"
 submit 		= "Save"
 or 			= "or"
 cancel		= "Cancel"
+key		= "Key"
 
 [delete]
 delete		= "Delete"
@@ -55,16 +67,25 @@ groups  	= "Edit Groups"
 account 	= "Edit Accounts"
 back 		= "Back to Website"
 
+[statistics]
+heading		= "Statistics"
+summary		= "Summary"
+by_age		= "(by age)"
+items		= "Items"
+gen_items	= "Generated items"
+
 [jsaccounts]
 accounts 	= "Accounts"
 groups 		= "Groups"
+groupname_label	= "Group name:"
 groupname 	= "Name"
 addgroup 	= "Create Group"
 
 [login]
 logintitle 	= "Login"
 login 		= "Login"
 pass 		= "Password"
+submit 		= "Submit"
 or 			= "or"
 register 	= "Register"
 back 		= "Back to Website"
@@ -84,28 +105,34 @@ back 		= "Back to Website"
 
 [menubar]
 logged 		= "logged as"
+not_logged	= "Not logged in!"
 login 		= "LOGIN"
 register 	= "REGISTER"
 logout 		= "LOGOUT"
 admin 		= "ADMIN"
+account		= "ACCOUNT"
 powered 	= "Powered by"
 
 [bin]
 delete 		= "Delete"
 
 [judge]
+infos		= "Infos"
+access		= "Access"
 public 		= "This item is public."
 gopriv 		= "Go Private"
 priv 		= "This item is private."
 gopub 		= "Go Public"
 accounts 	= "Allowed accounts"
 groups 		= "Allowed groups"
 set 		= "Set Rights"
+exif		= "Exif"
 
 [adminpanel]
 rename  	= "Rename"
 new 		= "New Folder"
 create 		= "Create"
+upload_heading	= "Upload"
 upload 		= "Upload images here"
 
 [boardheader]
@@ -114,15 +141,34 @@ download 	= "DOWNLOAD"
 [board]
 albums 		= "Albums"
 images 		= "Images"
+videos 		= "Videos"
 
 [comments]
+comment		= "Comment"
 comments 	= "Comments"
 anonymous 	= "Anonymous"
 submit 		= "Post Comment"
 
+[description]
+description	= "Description"
+submit		= "Post Description"
+
 [token]
 token       = "Guest Token"
 tokens      = "Guest Tokens"
 deletetoken = "Delete"
 createtoken = "Create Guest Token"
 
+[buttons]
+prev		= "Previous"
+back		= "Back"
+img		= "View"
+get		= "Download"
+slideshow	= "Start slideshow"
+pshere		= "Photo Sphere"
+next		= "Next"
+pause		= "Pause slideshow"
+play		= "Play slideshow"
+stop		= "Stop slideshow"
+rss		= "RSS feed"
+menuright	= "Menu"

inc/loc/francais.ini

@@ -1,59 +1,83 @@
 [settings]
-settings	= "Param&eagrave;tres"
+settings	= "Paramètres"
+global		= "Général"
 title 		= "Titre"
+site_address= "URL de la racine du site"
 buttons 	= "Boutons"
+s_networks	= "Réseaux sociaux"
 fb 			= "Facebook"
+facebook_appid 	= "Facebook Application ID"
+fbappid 	= "AppID"
 plusone 	= "Google +1"
 register 	= "Inscriptions"
+options		= "Options"
 noregister 	= "Bloquer les inscriptions"
 forcehttps 	= "Forcer HTTPS pour les inscriptions et identifications"
 comment		= "Comms"
 nocomment	= "Supprimer le panneau de commentaires"
 download	= "Archives"
+nocomments	= "Bloquer les commentaires"
+nodescription	= "Bloquer les descriptions"
 nodownload 	= "Bloquer le téléchargement de fichiers"
+reverse_menu	= "Inverser l'ordre du menu"
+rss		= "Flux RSS"
+button_title	= "Titre pour les boutons"
 numcomments	= "Nombre de commentaires sur la page de stats"
 numcomm 	= "Comms"
 sens 		= "Nombre maximal d'images affichées au survol d'album"
+thumbs_size	= "Taille des miniatures (px)"
 images 		= "Images"
 language	= "Langue"
+user_theme	= "Thème"
 submit		= "Valider"
-generate 	= "Générer les vignettes et images 800x600 (récursif)"
+generate 	= "Générer les vignettes et images (récursif)"
 folder		= "Dossier"
 all			= "Tout"
 gener		= "Générer"
-video_comment	= "PhotoShow affiche uniquement les vidéos au format Webm. Tu peux activer l'encodage pour les autres formats"
+video		= "Vidéo"
+video_comment	= "PhotoShow affiche uniquement les vidéos au format WebM. Vous pouvez définir l'encodage pour les autres formats."
 encode_video	= "Encodage vidéo"
 ffmpeg_path	= "Chemin ffmpeg"
 ffmpeg_option	= "Options ffmpeg"
 
 [account]
 createaccount	= "Créer un compte"
 account 	= "Compte"
-editing		= "Edition du compte : "
+editing		= "Édition du compte : "
 name		= "Nom"
 email		= "Courriel"
 password	= "Mot de passe"
 oldpass		= "Ancien mdp"
 submit 		= "Sauver"
 or 			= "ou"
 cancel		= "Annuler"
+key		= "Clef"
 
 [delete]
 delete		= "Supprimer"
 path		= "Chemin"
 submit 		= "Supprimer"
 
 [adminmenu]
-about 		= "À propos..."
-stats 		= "Afficher statistiques"
-settings 	= "Préférences"
+about 		= "À propos"
+stats 		= "Statistiques"
+tokens 		= "Jetons d'authentification"
+settings 	= "Paramètres"
 account 	= "Comptes"
 groups 		= "Groupes"
 back 		= "Retour au site"
 
+[statistics]
+heading		= "Statistiques"
+summary		= "Résumé"
+by_age		= "(par âge)"
+items		= "Objets"
+gen_items	= "Objets générés"
+
 [jsaccounts]
 accounts 	= "Comptes"
 groups 		= "Groupes"
+groupname_label	= "Nom du groupe :"
 groupname 	= "Nom"
 addgroup 	= "Créer le groupe"
 
@@ -81,28 +105,34 @@ back 		= "Retourner au site"
 
 [menubar]
 logged 		= "connecté en tant que"
+not_logged	= "Non connecté(e)"
 login 		= "CONNEXION"
 register 	= "INSCRIPTION"
 logout 		= "DÉCONNEXION"
 admin 		= "PRÉFÉRENCES"
+account		= "COMPTE"
 powered 	= "Ce site utilise"
 
 [bin]
 delete 		= "Supprimer"
 
 [judge]
+infos		= "Infos"
+access		= "Accès"
 public 		= "Cet élément est public."
 gopriv 		= "Passer privé"
 priv 		= "Cet élément est privé."
 gopub 		= "Passer public"
 accounts 	= "Comptes autorisés"
 groups 		= "Groupes autorisés"
 set 		= "Valider"
+exif		= "Exif"
 
 [adminpanel]
 rename  	= "Renommer"
 new 		= "Nouveau dossier"
 create 		= "Créer"
+upload_heading	= "Ajout"
 upload 		= "Ajouter des images"
 
 [boardheader]
@@ -111,7 +141,34 @@ download 	= "TÉLÉCHARGER"
 [board]
 albums 		= "Albums"
 images 		= "Images"
+videos 		= "Vidéos"
 
 [comments]
+comment		= "Commentaire"
+comments 	= "Commentaires"
 anonymous 	= "Anonyme"
 submit 		= "Commenter"
+
+[description]
+description	= "Description"
+submit		= "Enregistrer"
+
+[token]
+token       = "Jeton invité"
+tokens      = "Jetons d'authentification"
+deletetoken = "Supprimer"
+createtoken = "Créer un jeton"
+
+[buttons]
+prev		= "Précédent"
+back		= "Retour"
+img		= "Afficher"
+get		= "Télécharger"
+slideshow	= "Démarrer le diaporama"
+pshere		= "Photo Sphere"
+next		= "Suivant"
+pause		= "Mettre en pause le diaporama"
+play		= "Reprendre le diaporama"
+stop		= "Quitter le diaporama"
+rss		= "Flux RSS"
+menuright	= "Menu"

index.php

@@ -63,6 +63,13 @@ function protect_user_send_var($var){
 		return addslashes($var);
 }
 
+/// workaround for splitting basename whith beginning utf8 multibyte char
+/// See https://bugs.php.net/bug.php?id=37268
+function mb_basename($filepath, $suffix = NULL) {
+	$splited = preg_split ( '/\//', rtrim ( $filepath, '/ ' ) );
+	return substr ( basename ( 'X' . $splited [count ( $splited ) - 1], $suffix ), 1 );
+}
+
 
 if (!get_magic_quotes_gpc()){
 	$_POST = protect_user_send_var($_POST);

src/classes/Account.php

@@ -444,7 +444,7 @@ public function toHTML(){
 	 	$this->header();
 
  		echo "<div class='header'>";
- 		echo "<h1>Account</h1>";
+ 		echo "<h1>".Settings::_("jsaccounts","accounts")."</h1>";
  		echo "</div>";
 
 		if(CurrentUser::$admin){
@@ -509,9 +509,9 @@ public function toHTML(){
 		}
 		echo	"</select>\n";
 
-		/// Login
+		/// Key
 		echo "<div class='pure-control-group'>
-					<label>".Settings::_("account","Key")."</label>
+					<label>".Settings::_("account","key")."</label>
 					<input type='text' name='key' readonly='readonly' value=\"".htmlentities($this->get_key(), ENT_QUOTES ,'UTF-8')."\">
 				</div>";