Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Consolidate lib/translations/fa_IR.js and fa_ir.js #685

Closed
steveyken opened this issue Apr 21, 2015 · 2 comments
Closed

Consolidate lib/translations/fa_IR.js and fa_ir.js #685

steveyken opened this issue Apr 21, 2015 · 2 comments
Assignees

Comments

@steveyken
Copy link

Looks like you've got two translation files for the same language:

  • lib/translations/fa_IR.js
  • lib/translations/fa_ir.js

I'm using pickadate via ember-cli and bower/broccoli build system which gives me the following error on the latest pickadate version.

Error: Merge error: conflicting capitalizations: pickadate/lib/translations/fa_IR.js in <path>/tmp/funnel-dest_CDIUjl.tmp pickadate/lib/translations/fa_ir.js in <path>/tmp/funnel-dest_CDIUjl.tmp Remove one of the files and re-add it with matching capitalization. We are strict about this to avoid divergent behavior between case-insensitive Mac/Windows and case-sensitive Linux.

@mcm-ham
Copy link

mcm-ham commented Apr 21, 2015

It looks like two identical commits in source history just different file casing 8bf81ac 3193dbf

@mohamnag
Copy link

they are definitely the same, do you plan to fix this soon by removing one so that builds can run normally again?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

4 participants