consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,813 Commits 1 Branch 0 Tags
59b35156b1f488b0e81e4112dfa4613c897b51de
Commit Graph

2444 Commits

Author SHA1 Message Date
voodoorai2000
ad51109149 Remove duplicate language translation 2018-10-05 18:08:48 +02:00
voodoorai2000
168ebe3c8b Fix i18n task' specs 
Add i18n.yml to i18n task's available translation files
 2018-10-05 18:08:47 +02:00
voodoorai2000
9d7042c5ae Adds missing language name translations 2018-10-05 18:08:47 +02:00
voodoorai2000
66c9f6711b Removes obsolete locale keys for language names 2018-10-05 18:08:47 +02:00
Javier Martín
132fea9c94 Merge pull request #2913 from papayalabs/2741-updates-translatable-custom-pages-reloaded 
Updates translatable custom pages
 2018-10-03 13:23:13 +02:00
decabeza
dd11a040a6 Adds setting to enable or disable help page 2018-09-28 18:59:28 +02:00
Papaya Labs
914bfa645e Updates translatable custom pages 2018-09-27 13:46:17 +02:00
decabeza
62490c4640 Adds custom javascripts folder 2018-09-26 12:34:16 +02:00
Javier Martín
ef0192c3ff Merge pull request #2912 from consul/backport-make-collaborative-legislation-translatable 
Make collaborative legislation translatable
 2018-09-24 17:45:59 +02:00
Alberto
e0d08a32dd Merge pull request #2916 from consul/custom-fonts 
[Backport] Custom fonts
 2018-09-21 14:29:50 +02:00
decabeza
a94591fe78 Loads custom fonts before default ones 
Also includes a .keep file inside fonts/custom folder to track the directory by git
 2018-09-21 13:46:50 +02:00
decabeza
a1bbc82c8d Changes allegations dates label 2018-09-20 17:33:04 +02:00
Marko Lovic
64d72ca8e7 Enable JS in shared translatable test 
Due to its markdown editor, the admin draft version page
requires JS to correctly render the draft version form.
 2018-09-19 14:54:24 +02:00
Marko Lovic
0731b137cf Add both English and Spanish translations to Admin Notification seeds 2018-09-19 12:15:45 +02:00
Marko Lovic
3be3b7342c Reinstate deleted translations for seed Admin Notifications 
These were removed in 5c726e0, seemingly by mistake. The change
doesn't make sense in the context of the commit, and it breaks
the seed data.
 2018-09-19 12:15:40 +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
María Checa
eeb7463ff4 Merge pull request #2860 from consul/backport_1582-icon-polls 
[Backport] Adds status icons on polls poll group
 2018-09-18 12:42:37 +02:00
Raimond Garcia
71a537b4db Merge pull request #2903 from consul/backport-refactor-translatable-specs 
[Backport] Refactor translatable specs
 2018-09-17 23:05:06 +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
726110c91e Share Globalize JavaScript interface specs 2018-09-17 20:34:20 +02:00
Javi Martín
a64a290392 Extract commentable_path to an initializer 
By doing so and including it in ActionDispatch::Routing::UrlFor, we make
it available in controllers, helpers and specs, and so we can remove the
duplication we had there with methods dealing with the same problem.

Even if monkey-patching is ugly, using a different module and executing
ActionDispatch::Routing::UrlFor.send(:include, MyModule) wouldn't make
the method available in the controller.
 2018-09-17 20:28:55 +02:00
voodoorai2000
2892d0e1d5 Add placeholder configuration for SMTP 2018-09-13 20:38:42 +02:00
Javi Martín
43e83889ff Simplify CKEditor authorization 
We can use the `config.authorize_with` option, so we don't need to copy
the controller in order to load and authorize resource.

Besides, only administrators can upload images, so we don't need to
track the image's user id.
 2018-09-12 12:35:28 +02:00
Javi Martín
71ce7acc10 Restore deleted CKEditor config 
Just so we can navigate throught git history faster:

* Introduced in 345e34d to avoid precompiling all CKEditor assets.
* Modified in 54c82a5 to avoid compiling assets during tests.
* Overwritten by `rails g ckeditor:install` in c0d6c0b.
 2018-09-12 12:35:28 +02:00
Javi Martín
27155dd7d7 Fix typo 2018-09-12 12:35:28 +02:00
Raúl Fuentes
d574657b77 Fixes for the review made by @javierm 
this commit will be merged with the others when the chages
are accepted
 2018-09-12 12:35:28 +02:00
Raúl Fuentes
88f0f14eab Modify the configuration of ckeditor 4 
add links, headers and images
 2018-09-12 12:35:28 +02:00
Raúl Fuentes
8e68f4bbd0 Update abilities for ckeditor4 images 
Add the image controller to use the obsolete load_and_authorize_resource
and authorize_resource methods in the gem
 2018-09-12 12:35:28 +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
Raimond Garcia
367eea19e3 Merge pull request #2844 from PierreMesure/patch-1 
Fix a misleading comment
 2018-09-07 18:38:06 +02:00
Raimond Garcia
09482aad09 Merge pull request #2785 from ziyan-junaideen/feature/1-nav-content-blocks 
Configurable Top Right and Main Navigation Menus
 2018-09-05 19:50:59 +02:00
Alberto
21f36e6be5 Merge branch 'master' into feature/1-nav-content-blocks 2018-09-05 12:41:07 +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
bc5741fb16 Adds status icons on polls poll group 2018-08-23 18:46:14 +02:00
Pierre
88d857f50c Fix a misleading comment 2018-08-13 11:27:49 +02:00
Juan Fernandez
653d36c9e6 Translate static pages 2018-08-04 15:28:41 -04:00
decabeza
108e458678 Adds description to all admin settings 2018-07-31 13:25:39 +02:00
Alberto
5546f5b125 Merge pull request #2817 from consul/custom-content 
Custom content
 2018-07-31 12:43:21 +02:00
decabeza
71d45093b6 Removes custom content on proposals 2018-07-30 19:35:12 +02:00
decabeza
e14b7b67fb Removes custom content on footer 2018-07-30 17:59:33 +02:00
decabeza
b43945ad33 Removes custom content on management and devise views 2018-07-30 17:58:13 +02:00
decabeza
f2ec836587 Removes custom content on mailers 2018-07-30 17:57:25 +02:00
decabeza
62343ba49b Removes custom content on top links 2018-07-30 17:56:23 +02:00
decabeza
52fa9d27ac Removes custom content on index views pages 2018-07-30 17:55:56 +02:00
decabeza
2543cf5d6c Removes custom content on help pages 2018-07-30 17:45:19 +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
Ziyan Junaideen
f78d81bc81 ES admin i18n 2018-07-27 20:14:03 +05:30
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
rgarcia
2995734762 Increase max cache size to 2MB 
We have lots of votes in this edition of participatory budgets and the
default cache size (1MB) is not enough to hold certain cache fragments
 2018-07-27 12:08:20 +02: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