consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
20,144 Commits 1 Branch 0 Tags
a6d470ded657ff18d11d25b901b63facbfae6eb1
Commit Graph

1687 Commits

Author SHA1 Message Date
Juan Salvador Pérez García
488e7e081f Merge branch 'dashboard' into rebase_consul_master 2018-09-27 09:18:27 +02:00
Marko Lovic
86dbe799ba Remove extra tag element from cards form 2018-09-26 16:09:09 +02:00
Javi Martín
5bb5cfa7fb Make Widget::Card translatable 2018-09-26 16:09:09 +02:00
Raimond Garcia
4086220ebf Merge pull request #2914 from microweb10/make_polls_translatable 
Make polls translatable
 2018-09-26 13:19:17 +02:00
Raimond Garcia
1fbb428004 Merge pull request #2898 from papayalabs/2889-show-active-tab-in-custom-info-texts 
Show active tab in custom info texts
 2018-09-24 21:11:25 +02:00
Julian Herrero
e6762d6bca handle non-underscored locale names for cktext_area 2018-09-21 20:50:23 +02:00
Julian Herrero
673ec075eb Make answers translatable 2018-09-20 17:13:40 +02:00
Julian Herrero
5e6248d2ac Make questions translatable 2018-09-20 17:11:53 +02:00
Julian Herrero
9495208518 Make polls translatable 2018-09-20 17:07:43 +02:00
Papaya Labs
981281591e Show active tab in custom info texts 2018-09-19 13:20:10 -05:00
Javi Martín
cc6da6be28 Fix inputs in legislation process translations 
They were accidentally changed from `text_area` to `text_field` when
making them translatable.
 2018-09-19 14:54:24 +02:00
Marko Lovic
05bfa193cd Make Legislation Draft Versions translatable 2018-09-19 14:54:24 +02:00
Marko Lovic
06347062dd Make Legislation Questions translatable 2018-09-19 14:54:24 +02:00
Marko Lovic
d78aea1fd3 Make Legistlation Processes translatable 2018-09-19 14:54:24 +02:00
Marko Lovic
f6749049c9 Make Admin Notifications translatable 2018-09-19 12:15:26 +02:00
Marko Lovic
5ff85d33d6 Fix submit button text for Admin Notifications admin form 
In Madrid, the button text didn't change depending on whether the form
is for the "new" page or for the "edit" page.

In consul, the buttons texts were "create admin notification" and
"update admin notification" instead of "create notification" and "update
notification".

Also change translation key from "submit" to "submit_button" to
match other instances.
 2018-09-19 12:05:18 +02:00
Raimond Garcia
ea72cd058b Merge pull request #2876 from javierm/ckeditor4_update 
Ckeditor4 update
 2018-09-17 23:02:50 +02:00
Javi Martín
5faeefab2c Show the image button only if editing admin pages 
That's the only place where we need to attach images so far.
 2018-09-12 12:35:28 +02:00
Marko Lovic
c7fcdd9b0e Use standard locale names for Globalize 
It turns out it is not necessary to downcase and underscore
locale names to use the globalize-accessor gem. The gem
will automatically underscore the locale name when defining and
calling the accessor methods.
 2018-09-11 18:48:14 +02:00
Marko Lovic
a1567058b6 Fix type of field for Milestone form 2018-09-11 18:47:38 +02:00
Marko Lovic
7b0aa1e104 Extract merge_translatable_field_options helper method 2018-09-11 18:47:34 +02:00
Marko Lovic
61e3b3b406 Incorporate label into translatabel field 
Suggested by @javierm so that we can take advantage of certain browser
features that rely on a <label> tag being associated with an <input> tag.
 2018-09-11 18:47:28 +02:00
Marko Lovic
2cb3e4b111 Extract translatable field logic to FormBuilder 2018-09-11 18:46:50 +02:00
Marko Lovic
cb716e07d7 Extract translation helper from translatable form views 
So that individual form partials don't depend on the implementation
of how translations are deleted.
 2018-09-10 17:17:47 +02:00
Raimond Garcia
4f2ed27f8c Merge pull request #2865 from consul/backport_1585-make_banners_translatable 
[Backport] Make banners translatable
 2018-09-10 16:41:33 +02:00
Alberto
21f36e6be5 Merge branch 'master' into feature/1-nav-content-blocks 2018-09-05 12:41:07 +02:00
Marko Lovic
0fa4b60f39 Make Banners translatable 2018-08-30 16:29:29 +02:00
Marko Lovic
bfd9032e9d Extract translation partial to be shared within admin 
Refactor: behaviour should be 100% the same
 2018-08-27 18:24:24 +02:00
decabeza
b69d6292f1 Adds data deep link on admin settings filter subnav 2018-07-31 13:25:50 +02:00
decabeza
108e458678 Adds description to all admin settings 2018-07-31 13:25:39 +02:00
decabeza
3fee56e8fe Updates admin site customization specs 2018-07-31 12:55:05 +02:00
decabeza
defc04a5dc Unifies styles and views for admin geozones 2018-07-31 12:54:25 +02:00
decabeza
f77327e93c Unifies styles and views for admin site customization content blocks 2018-07-31 12:54:21 +02:00
decabeza
ee16900d1b Unifies styles and views for admin voting booths section 2018-07-31 12:54:12 +02:00
decabeza
6727583c0e Unifies styles and views for admin site content section 2018-07-31 12:52:35 +02:00
decabeza
dd98375c67 Unifies styles and views for admin sending of emails section 2018-07-31 12:52:31 +02:00
decabeza
a72eb380a2 Unifies styles and views for admin budgets 2018-07-31 12:52:21 +02:00
decabeza
f8707a73cd Unifies styles and views for admin legislation processes 2018-07-31 12:50:48 +02:00
Juan Salvador Pérez García
6cc1ddb9af Fixes #231 
Implements a poster feature for the proposals dashboard
 2018-07-31 12:50:25 +02:00
decabeza
6f324c6931 Unifies styles and views for admin polls 2018-07-31 12:48:01 +02:00
decabeza
076f9dd474 Moves back link to root path from dashboard to header 2018-07-31 12:47:51 +02:00
Raimond Garcia
2c79197a05 Merge pull request #2809 from wairbut-m2c/backport/translatable-content-for-admin 
Basic content for I18n on Admin panel
 2018-07-27 18:01:00 +02:00
Juan Salvador Pérez García
50f73abb0c Fixes #voodoorai2000 comments 
Fixes some comments from #voodoorai2000 for the PR to consul
 2018-07-27 16:30:03 +02:00
Alberto
fb19aafee7 Merge pull request #2778 from wairbut-m2c/backport/investments-moderation 
Allow budget investments to be moderated
 2018-07-27 12:34:17 +02:00
16yuki0702
c14fbf8540 Fixed misunderstanding 2018-07-27 16:34:00 +09:00
16yuki0702
57dbb0220a Fix active item on admin menu 2018-07-27 15:45:42 +09:00
rgarcia
4c8b174274 Display only translations for the current language 
After creating a translation in spanish, it was also displaying it when selecting
the english locale.

This was due to the code picking the first translation available

With this commit, we are checking for an existing translation in the current locale
and displaying it if it exists
 2018-07-26 21:55:07 -04:00
rgarcia
12f6f06ade Fix exception when using locale as a parameter in the url 
When visiting, for example, /admin/site_customization/information_texts?locale=fr
we were getting an `UncaughtThrowError: uncaught throw :exception`
With the following payload
```
File "/aytomad/app/participa/participacion/releases/20180726231929/app/views/admin/site_customization/information_texts/_form_field.html.erb" line 5

File "/aytomad/app/participa/participacion/releases/20180726231929/app/helpers/globalize_helper.rb" line 35 in block in globalize
```

Substituting this line seems to solve it

Note that we had to remove the portuguese local too, as it was giving a different
exception due to this change. This problem, has been solved in the original
globalization PR
 2018-07-26 21:55:06 -04:00
Angel Perez
26deb02937 Show I18n key on label instead of translation 2018-07-26 20:49:12 -04:00
Angel Perez
ad252ca835 Translations can be updated correctly 2018-07-26 20:49:00 -04:00