Minor locale improvements

client/main.lua

@@ -290,8 +290,8 @@ function OpenRecruitMenu(society)
             title    = _U('do_you_want_to_recruit', data.current.name),
             align    = 'top-left',
             elements = {
-              {label = _U('yes'), value = 'yes'},
               {label = _U('no'),  value = 'no'},
+              {label = _U('yes'), value = 'yes'}
             }
           },
           function(data2, menu2)
@@ -364,58 +364,53 @@ end
 
 function OpenManageGradesMenu(society)
 
-  ESX.TriggerServerCallback('esx_society:getJob', function(job)
+	ESX.TriggerServerCallback('esx_society:getJob', function(job)
 
-    local elements = {}
+		local elements = {}
 
-    for i=1, #job.grades, 1 do
-      local gradeLabel = (job.grades[i].label == '' and job.label or job.grades[i].label)
-      table.insert(elements, {label = gradeLabel .. ' $' .. job.grades[i].salary, value = job.grades[i].grade})
-    end
+		for i=1, #job.grades, 1 do
+			local gradeLabel = (job.grades[i].label == '' and job.label or job.grades[i].label)
+			table.insert(elements, {
+				label = (string.format ('%s - <span style="color: green;">$%i</span>', gradeLabel, job.grades[i].salary)),
+				value = job.grades[i].grade
+			})
+		end
 
-    ESX.UI.Menu.Open(
-      'default', GetCurrentResourceName(), 'manage_grades_' .. society,
-      {
-        title    = _U('salary_management'),
-        align    = 'top-left',
-        elements = elements
-      },
-      function(data, menu)
+		ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'manage_grades_' .. society,
+		{
+			title    = _U('salary_management'),
+			align    = 'top-left',
+			elements = elements
+		}, function(data, menu)
 
-        ESX.UI.Menu.Open(
-          'dialog', GetCurrentResourceName(), 'manage_grades_amount_' .. society,
-          {
-            title = _U('salary_amount')
-          },
-          function(data2, menu2)
+			ESX.UI.Menu.Open('dialog', GetCurrentResourceName(), 'manage_grades_amount_' .. society,
+			{
+				title = _U('salary_amount')
+			}, function(data2, menu2)
 
-            local amount = tonumber(data2.value)
+				local amount = tonumber(data2.value)
 
-            if amount == nil then
-              ESX.ShowNotification(_U('invalid_amount'))
-            elseif amount >= Config.MaxSalary then
-              ESX.ShowNotification(_U('invalid_amount_max'))
-            else
-              menu2.close()
+				if amount == nil then
+					ESX.ShowNotification(_U('invalid_amount'))
+				elseif amount >= Config.MaxSalary then
+					ESX.ShowNotification(_U('invalid_amount_max'))
+				else
+					menu2.close()
 
-              ESX.TriggerServerCallback('esx_society:setJobSalary', function()
-                OpenManageGradesMenu(society)
-              end, society, data.current.value, amount)
-            end
+					ESX.TriggerServerCallback('esx_society:setJobSalary', function()
+						OpenManageGradesMenu(society)
+					end, society, data.current.value, amount)
+				end
 
-          end,
-          function(data2, menu2)
-            menu2.close()
-          end
-        )
+			end, function(data2, menu2)
+				menu2.close()
+			end)
 
-      end,
-      function(data, menu)
-        menu.close()
-      end
-    )
+		end, function(data, menu)
+			menu.close()
+		end)
 
-  end, society)
+	end, society)
 
 end
 

locales/en.lua

@@ -11,6 +11,7 @@ Locales['en'] = {
   ['have_deposited']         = 'you have deposited ~r~$%s~s~',
   ['have_withdrawn']         = 'you have withdrawn ~g~$%s~s~',
   ['invalid_amount']         = 'invalid amount',
+  ['invalid_amount_max']     = 'that salary is not allowed',
   ['no']                     = 'no',
   ['promote']                = 'promote',
   ['promote_employee']       = 'promote %s',
@@ -23,12 +24,12 @@ Locales['en'] = {
   ['withdraw_amount']        = 'witdraw amount',
   ['withdraw_society_money'] = 'withdraw society money',
   ['yes']                    = 'yes',
-  ['you_have']               = 'you have ~g~%s$~s~ waiting in ~y~money laundering~s~ (24h).',
+  ['you_have']               = 'you have ~g~$%s~s~ waiting in ~y~money laundering~s~ (24h).',
   ['you_have_laundered']     = 'you have ~r~laundered~s~ your money: ~g~$%s~s~',
-  ['you_have_hired']         = 'you have recruited %s', 
-  ['you_have_been_hired']    = 'you have been hired by %s', 
-  ['you_have_fired']         = 'you have fired %s', 
-  ['you_have_been_fired']    = 'you have been fired from %s', 
-  ['you_have_promoted']      = 'you have promoted %s as %s', 
-  ['you_have_been_promoted'] = 'you have been promoted', 
+  ['you_have_hired']         = 'you have recruited %s',
+  ['you_have_been_hired']    = 'you have been hired by %s',
+  ['you_have_fired']         = 'you have fired %s',
+  ['you_have_been_fired']    = 'you have been fired from %s',
+  ['you_have_promoted']      = 'you have promoted %s as %s',
+  ['you_have_been_promoted'] = 'you have been ~b~promoted~s~!',
 }

locales/fi.lua

@@ -8,9 +8,10 @@ Locales['fi'] = {
   ['employee_management']    = 'työntekijöiden hallinta',
   ['fire']                   = 'anna potkut',
   ['grade']                  = 'taso',
-  ['have_deposited']         = 'sinä talletit ~r~€',
-  ['have_withdrawn']         = 'sinä nostit ~g~€',
+  ['have_deposited']         = 'sinä talletit ~r~€%s~s~',
+  ['have_withdrawn']         = 'sinä nostit ~g~€%s~s~',
   ['invalid_amount']         = 'virheellinen summa',
+  ['invalid_amount_max']     = 'that salary is not allowed',
   ['no']                     = 'ei',
   ['promote']                = 'ylennä',
   ['promote_employee']       = 'ylennä henkilö %s',
@@ -23,8 +24,8 @@ Locales['fi'] = {
   ['withdraw_amount']        = 'nostettava määrä',
   ['withdraw_society_money'] = 'nosta yrityksen rahoja',
   ['yes']                    = 'kyllä',
-  ['you_have']               = 'sinulla on ~g~€',
-  ['you_have_laundered']     = 'olet ~r~pessyt~s~ rahojasi: ~g~€',
+  ['you_have']               = 'you have ~g~$%s~s~ waiting in ~y~money laundering~s~ (24h).',
+  ['you_have_laundered']     = 'olet ~r~pessyt~s~ rahojasi: ~g~€%s~s~',
   ['you_have_hired']         = 'sinä palkkasit henkilön %s',
   ['you_have_been_hired']    = 'sinut on palkattu pelaajan %s toimesta',
   ['you_have_fired']         = 'sinä annoit potkut pelaajalle %s',

locales/fr.lua

@@ -11,6 +11,7 @@ Locales['fr'] = {
   ['have_deposited']         = 'vous avez déposé ~r~$%s~s~',
   ['have_withdrawn']         = 'vous avez retiré ~g~$%s~s~',
   ['invalid_amount']         = 'montant invalide',
+  ['invalid_amount_max']     = 'that salary is not allowed',
   ['no']                     = 'non',
   ['promote']                = 'promouvoir',
   ['promote_employee']       = 'promouvoir %s',

locales/pl.lua

@@ -11,6 +11,7 @@ Locales['pl'] = {
   ['have_deposited']         = 'zdeponowałeś ~r~$%s~s~',
   ['have_withdrawn']         = 'wypłaciłeś ~g~$%s~s~',
   ['invalid_amount']         = 'nieprawidłowa wartość',
+  ['invalid_amount_max']     = 'that salary is not allowed',
   ['no']                     = 'nie',
   ['promote']                = 'awansuj',
   ['promote_employee']       = 'awansuj %s',
@@ -25,10 +26,10 @@ Locales['pl'] = {
   ['yes']                    = 'tak',
   ['you_have']               = 'masz ~g~%s$~s~ czekanie ~y~w pralni pieniędzmi~s~ (24h).',
   ['you_have_laundered']     = '~r~Wyprałeś~s~ twoje pieniądze: ~g~$%s~s~',
-  ['you_have_hired']         = 'zatrudniłeś %s', 
-  ['you_have_been_hired']    = 'zostałeś zatrudniony przez %s', 
-  ['you_have_fired']         = 'zwolniłeś %s', 
-  ['you_have_been_fired']    = 'zostałeś zwolniony %s', 
-  ['you_have_promoted']      = 'awansowałeś %s na %s', 
-  ['you_have_been_promoted'] = 'zostałeś awansowany', 
+  ['you_have_hired']         = 'zatrudniłeś %s',
+  ['you_have_been_hired']    = 'zostałeś zatrudniony przez %s',
+  ['you_have_fired']         = 'zwolniłeś %s',
+  ['you_have_been_fired']    = 'zostałeś zwolniony %s',
+  ['you_have_promoted']      = 'awansowałeś %s na %s',
+  ['you_have_been_promoted'] = 'zostałeś awansowany',
 }

locales/sv.lua

@@ -8,9 +8,10 @@ Locales['sv'] = {
   ['employee_management']    = 'medarbetarhantering',
   ['fire']                   = 'sparka',
   ['grade']                  = 'grade',
-  ['have_deposited']         = 'du har satt in ~r~$%s~s~',
-  ['have_withdrawn']         = 'du har tagit ut ~g~$%s~s~',
+  ['have_deposited']         = 'du har satt in ~r~%s SEK~s~',
+  ['have_withdrawn']         = 'du har tagit ut ~g~%s SEK~s~',
   ['invalid_amount']         = 'ogiltigt belopp',
+  ['invalid_amount_max']     = 'den lönen är inte tillåten',
   ['no']                     = 'nej',
   ['promote']                = 'befodra',
   ['promote_employee']       = 'befodra %s',
@@ -23,12 +24,12 @@ Locales['sv'] = {
   ['withdraw_amount']        = 'Ta ut summan',
   ['withdraw_society_money'] = 'ta ut samhällspengar',
   ['yes']                    = 'ja',
-  ['you_have']               = 'du har ~g~%s$~s~ som väntar på ~y~pengartvätt~s~ (24h).',
-  ['you_have_laundered']     = 'du har ~r~tvättat~s~ dina pengar: ~g~$%s~s~',
-  ['you_have_hired']         = 'du har anställt ~y~%s~s~', 
-  ['you_have_been_hired']    = 'du har blivit anställd utav %s', 
-  ['you_have_fired']         = 'du har ~r~sparkat~s~ ~y~%s~s~', 
-  ['you_have_been_fired']    = 'du har blivit ~r~sparkad~s~ utav ~y~%s~s~', 
-  ['you_have_promoted']      = 'du har befodrat ~y~%s~s~ till ~b~%s~s~', 
-  ['you_have_been_promoted'] = 'du har blivit ~b~befodrad~s~', 
+  ['you_have']               = 'du har ~g~%s SEK~s~ som väntar på ~y~pengartvätt~s~ (24h).',
+  ['you_have_laundered']     = 'du har ~r~tvättat~s~ dina pengar: ~g~%s SEK~s~',
+  ['you_have_hired']         = 'du har anställt ~y~%s~s~',
+  ['you_have_been_hired']    = 'du har blivit anställd utav %s',
+  ['you_have_fired']         = 'du har ~r~sparkat~s~ ~y~%s~s~',
+  ['you_have_been_fired']    = 'du har blivit ~r~sparkad~s~ utav ~y~%s~s~',
+  ['you_have_promoted']      = 'du har befodrat ~y~%s~s~ till ~b~%s~s~',
+  ['you_have_been_promoted'] = 'du har blivit ~b~befodrad~s~',
 }