[Freeciv-Dev] Happiness dialog - some bugs (PR#1581)

[nightmare@xxxxxxxxxx]

Full_Name: Davide Pagnin
Version: latest cvs 
Distribution: Built from source
Client: Gtk+
OS: Linux
Submission from: (NULL) (193.205.80.85)


In the happiness display, angrycitizen option in not handled correctly.
If there is any angry citizen in a city, it appears as a taxman.

With fundamentalism as governament, the happiness display states that
military units may cause unhappiness, like in a republic or democracy,
this is obviously wrong.

When accounting luxuries that are considered for happiness effects, the 
happiness dialog states that there is a cap on the maximum luxury usable
in a single city (2 x city dimension), this is not true, as this 
behaviour was never introduced in freeciv (this is tipical of civ2)