Merge pull request #813 from slainer68/ga_domain_name

Google Analytics Domain name site setting

app/models/site_setting.rb

@@ -26,6 +26,7 @@ class SiteSetting < ActiveRecord::Base
   client_setting(:track_external_right_clicks, false)
   client_setting(:must_approve_users, false)
   client_setting(:ga_tracking_code, "")
+  client_setting(:ga_domain_name, "")
   client_setting(:new_topics_rollup, 1)
   client_setting(:enable_long_polling, true)
   client_setting(:polling_interval, 3000)

app/views/common/_google_analytics.html.erb

@@ -2,6 +2,11 @@
 
   var _gaq = _gaq || [];
   _gaq.push(['_setAccount', '<%= SiteSetting.ga_tracking_code %>']);
+
+  <% if SiteSetting.ga_domain_name.present? %>
+    _gaq.push(['_setDomainName', '<%= SiteSetting.ga_domain_name %>']);
+  <% end %>
+
   _gaq.push(['_setCustomVar', 1, 'Anonymous', <%= !current_user %>, 2]);
   _gaq.push(['_trackPageview']);
 

config/locales/server.en.yml

@@ -453,6 +453,7 @@ en:
     post_undo_action_window_mins: "Number of seconds users are allowed to reverse actions on a post (like, flag, etc)"
     must_approve_users: "Admins must approve all users before they gain access"
     ga_tracking_code: "Google analytics tracking code code, eg: UA-12345678-9; see http://google.com/analytics"
+    ga_domain_name: "Google analytics domain name, eg: mysite.com; see http://google.com/analytics"
     top_menu: "Determine which items appear in the homepage navigation, and in what order. Example latest|hot|read|favorited|unread|new|posted|categories"
     post_menu: "Determine which items appear on the post menu, and in what order. Example like|edit|flag|delete|share|bookmark|reply"
     share_links: "Determine which items appear on the share dialog, and in what order. Example twitter|facebook|google+"

config/locales/server.fr.yml

@@ -461,7 +461,8 @@ fr:
     traditional_markdown_linebreaks: "Utiliser le retour à la ligne traditionnel dans markdown, le wrapping est implicite sauf si suivi de 2 espaces"
     post_undo_action_window_mins: "La fenêtre dans laquelle chacun peut annuler une action sur un message (comme signaler)"
     must_approve_users: "Les propriétaires du forum doivent approuver les utilisateurs avant qu'il y aient accès."
-    ga_tracking_code: "Code de suivi de Google Analytics, voir: http://google.com/analytics"
+    ga_tracking_code: "Code de suivi de Google Analytics, par exemple : UA-12345678-9, voir: http://google.com/analytics"
+    ga_domain_name: "Domaine de suivi de Google Analytics, par exemple : monsite.com, voir: http://google.com/analytics"
     top_menu: "L'ordre des éléments dans le menu du haut. Exemple populaire|lus|favoris|non lus|nouveaux|posté|categories"
     post_menu: "L'ordre des éléments dans le menu de rédaction"
     share_links: "Liste ordonnée des boutons de partage. Exemple : twitter|facebook|google+"