From 26c6a8cae7e4c5d508d77b2a2f74a77a986ce471 Mon Sep 17 00:00:00 2001
From: Ummon <greg.burri@gmail.com>
Date: Tue, 8 Sep 2020 22:17:09 +0200
Subject: [PATCH] Replace some french comments by english ones.

---
 index.yaws                        | 17 +++--------------
 js/betterjs.js                    | 27 ---------------------------
 modules/erl/euphorik_bd_admin.erl |  4 ++--
 tools/tools.erl                   | 13 -------------
 tools/update_server.erl           | 19 +++++++++++++++++--
 5 files changed, 22 insertions(+), 58 deletions(-)
diff --git a/index.yaws b/index.yaws
index 9b80ee1..d295414 100755
--- a/index.yaws
+++ b/index.yaws
@@ -1,16 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
-"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<erl>
- out(A) ->
-   {header, {content_type,
-      case string:str((A#arg.headers)#headers.user_agent, "MSIE") of
-         0 -> "text/html"; %"application/xhtml+xml"; % TODO : jquery.lightbox does not support application/xhtml+xml
-         _ -> "text/html"
-      end
-   }}.
-</erl>
-<html xmlns="http://www.w3.org/1999/xhtml">
+<!DOCTYPE html>
+<html>
 <head>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    <title>euphorik.ch</title>
@@ -81,7 +70,7 @@
             <p>
                <select id="menuCss">
                   <erl>
-                     % parse les styles disponible
+                     % Parse the available styles.
                      out(A) ->
                         Styles_dir = A#arg.docroot ++ "/styles",
                         {ok, Liste_dir} = file:list_dir(Styles_dir),
diff --git a/js/betterjs.js b/js/betterjs.js
index b4d0bb6..41d6223 100644
--- a/js/betterjs.js
+++ b/js/betterjs.js
@@ -72,30 +72,3 @@ String.prototype.ltrim = function() {
 String.prototype.rtrim = function() {
 	return this.replace(/\s+$/, "");
 };
-
-/**
-  * (Not use for the moment)
-  * See : http://www.coolpage.com/developer/javascript/Correct%20OOP%20for%20Javascript.html
-  *
-  * Example :
-  *
-  * function Mammal(name) {
-  *    this.name = name;
-  * }
-  *
-  * Cat.Inherits(Mammal);
-  * function Cat(name) {
-  *    this.Super(Mammal, name);
-  * }
-  */
-/*Object.prototype.Super = function(parent) {
-   if(arguments.length > 1) {
-      parent.apply( this, Array.prototype.slice.call( arguments, 1 ) );
-   } else {
-      parent.call( this );
-   }
-}
-Function.prototype.Inherits = function(parent) {
-   this.prototype = new parent();
-   this.prototype.constructor = this;
-}*/
diff --git a/modules/erl/euphorik_bd_admin.erl b/modules/erl/euphorik_bd_admin.erl
index 84fe459..4a681c2 100644
--- a/modules/erl/euphorik_bd_admin.erl
+++ b/modules/erl/euphorik_bd_admin.erl
@@ -62,7 +62,7 @@ version_bd() ->
 create() ->
    mnesia:stop(),
    mnesia:delete_schema([node()]),
-   mnesia:create_schema([node()]), % nÃ©cessaire pour les tables sur disc
+   mnesia:create_schema([node()]), % Needed for tables on disk.
    mnesia:start(),
    create_tables(),
    reset().
@@ -141,7 +141,7 @@ reset() ->
    mnesia:clear_table(minichat),
    mnesia:clear_table(troll),
    mnesia:clear_table(ip_table),
-   % Create the root user.
+   % Create the root user and write the current database version.
    mnesia:transaction(fun() ->
       mnesia:write(#proprietes{nom = version, valeur = ?DB_VERSION}),
       User = #user{id = 0, profile = #profile{pseudo = "Sys"}, login = "Sys", date_creation = erlang:timestamp(), date_derniere_connexion = erlang:timestamp(), ek_master = true},
diff --git a/tools/tools.erl b/tools/tools.erl
index 28f36cf..764b9af 100755
--- a/tools/tools.erl
+++ b/tools/tools.erl
@@ -49,19 +49,6 @@ create_uri(Uri_str) ->
    #uri{host = Host, path = Path}.
 
 build() ->
-   % Create the directory "var/database" if it doesn't exist.
-   {ok, Files_in_root} = file:list_dir("."),
-   Var_exists = lists:any(fun(Name) -> Name =:= "var" end, Files_in_root),
-   if not Var_exists ->
-      file:make_dir("var");
-      true -> ok
-   end,
-   {ok, Files_in_var} = file:list_dir("var"),
-   Database_exists = lists:any(fun(Name) -> Name =:= "database" end, Files_in_var),
-   if not Database_exists ->
-      file:make_dir("var/database");
-      true -> ok
-   end,
    % Build all the Erlang modules.
    cmd("make", [], "modules").
 
diff --git a/tools/update_server.erl b/tools/update_server.erl
index b375c0e..10b899b 100755
--- a/tools/update_server.erl
+++ b/tools/update_server.erl
@@ -13,17 +13,32 @@ hote() ->
 main([Node_name]) when Node_name =:= "yaws"; Node_name =:= "yaws_dev" ->
    Node = list_to_atom(Node_name ++ atom_to_list(hote())),
    net_kernel:start([flynux, shortnames]),
-   io:format("rechargement des modules..~n"),
+   io:format("reloading modules...~n"),
    rpc:call(Node, euphorik_daemon, reload_euphorik, []),
    if Node_name =:= "yaws_dev" -> copy_database(Node);
       true -> true
    end,
-   io:format("mise Ã  jour de la BD..~n"),
+   io:format("updating database...~n"),
    rpc:call(Node, euphorik_bd_admin, update, []);
 main(_) ->
    io:format("Usage: update_server.erl <node-name>"),
    halt(1).
 
+create_database_directory() ->
+   % Create the directory "var/database" if it doesn't exist.
+   {ok, Files_in_root} = file:list_dir("."),
+   Var_exists = lists:any(fun(Name) -> Name =:= "var" end, Files_in_root),
+   if not Var_exists ->
+      file:make_dir("var");
+      true -> ok
+   end,
+   {ok, Files_in_var} = file:list_dir("var"),
+   Database_exists = lists:any(fun(Name) -> Name =:= "database" end, Files_in_var),
+   if not Database_exists ->
+      file:make_dir("var/database");
+      true -> ok
+   end.
+
 % Copy the datbase from the production to pre production.
 copy_database(Node) ->
    io:format("Copying production database to pre-production node~n"),
-- 
2.43.0

