External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-09-16 08:50:10 -02:30
Code Issues Packages Projects Releases Wiki Activity
11,081 Commits 65 Branches 102 Tags
37d8e57c4f2b6d57c965a57310cadf24eccf7752
Commit Graph
16 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Shane McDonald 1cac3abc9f Whitespace fix in translation 2017-01-23 14:50:35 -05:00
Shane McDonald 483fbb6f24 Pull in latest translations 2017-01-23 12:25:57 -05:00
Shane McDonald b60b4b2bc1 Generate .mo files without django, enable API l10n at build time. 2017-01-23 12:25:56 -05:00
Shane McDonald 933512be63 Revert "Manually add .mo files (for now) to get API l10 working." 
This reverts commit 3acb71784fdcaff34644b31fc1bdf4914229c503.

# Conflicts:
#	awx/locale/fr/LC_MESSAGES/ansible-tower-ui.mo
 2017-01-23 12:25:56 -05:00
Shane McDonald ad4323ebb8 Update French .mo file 2017-01-19 15:54:58 -05:00
Shane McDonald 8b7435ccd3 Manually add .mo files (for now) to get API l10 working. 2017-01-13 14:49:40 -05:00
Shane McDonald e0cd4bc7ae Get Japanese API l10 working 
Worked with matburt on this. There were some inconsistencies between our code and the po files.
 2017-01-13 14:49:40 -05:00
Shane McDonald 6b0573da71 Uncomment line that requests UI l10n files. 2017-01-12 21:09:18 -05:00
Shane McDonald cbf0c2704d Separate API and UI l10n make targets. 
A couple reasons for this:

- The command for generating the API l10n files is currently broken, and I want to get the translation folks looking at the UI ASAP.
- These things require different environments:
  - Generating the UI files requires Grunt, which is only available *before* packaging. We generate the static files before invoking mock or pbuilder.
  - Generating the API files requires Django, which is only available inside the virtual environment. This will likely need to be invoked somewhere inside of the install playbooks.
 2017-01-12 21:09:18 -05:00
Shane McDonald 894577c89a Add Japanese and French po files for the UI. 2017-01-12 21:09:18 -05:00
Shane McDonald dfa85dbbd2 Merge pull request #1896 from shanemcd/expiration-date 
*Really* display correct expiration date on license page.
 2016-05-16 14:43:45 -04:00
Shane McDonald dacbeed5a4 Merge pull request #1886 from shanemcd/license-expiration-date 
Fix license expiration date / time remaining
 2016-05-11 10:25:48 -04:00
Shane McDonald 0a315f5c60 Merge pull request #1770 from shanemcd/prevent-orphaned-supervisor-processes 
Fix supervisor restarts / prevent orphaned processes.
 2016-05-03 10:13:01 -04:00
Shane McDonald 629c46fb0c Merge pull request #1501 from shanemcd/fix-ami-install-script 
Make Packer inventory consistent with setup/inventory
 2016-04-12 11:51:24 -04:00
Shane McDonald 81268f7106 Merge pull request #1497 from shanemcd/remove-unnecessary-config-play 
Remove unnecessary play in configuration playbook.
 2016-04-12 09:35:22 -04:00
Shane McDonald 0a15ece049 Merge pull request #1483 from shanemcd/packer-centos7 
Use CentOS 7 as source AMI in Packer template.
 2016-04-11 15:06:23 -04:00