[zanata/zanata-client] 20970d: rhbz1174516 - enable more flexible file mappings r...

[GitHub]

  Branch: refs/heads/integration/master
  Home:   https://github.com/zanata/zanata-client
  Commit: 20970d26fb922603b181c04faad08280ec802f15
      https://github.com/zanata/zanata-client/commit/20970d26fb922603b181c04faad08280ec802f15
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-12-17 (Wed, 17 Dec 2014)

  Changed paths:
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/AbstractGettextPushStrategy.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/GettextDirStrategy.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/GettextPushStrategy.java
    M zanata-client-commands/src/test/java/org/zanata/client/commands/push/GettextDirStrategyTest.java

  Log Message:
  -----------
  rhbz1174516 - enable more flexible file mappings rules in podir and gettext project

- when push, podir project will log warning on locales don't have any translation file but won't rely on directory convention
- when push, gettext project will log warning on po file missing locale but won't rely on file name convention


  Commit: 2ba3685c07ab53d81beed6668f28a012a012d863
      https://github.com/zanata/zanata-client/commit/2ba3685c07ab53d81beed6668f28a012a012d863
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-12-23 (Tue, 23 Dec 2014)

  Changed paths:
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/AbstractGettextPushStrategy.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/GettextDirStrategy.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/GettextPushStrategy.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java
    M zanata-client-commands/src/test/java/org/zanata/client/commands/push/GettextDirStrategyTest.java

  Log Message:
  -----------
  Optimization: strip untranslated entries if merge type is NOT import (i.e. auto)

- if after the stripping there is no entries left, we can skip the REST call for that translation file


  Commit: 29cbd7ec6e85e4a42292476fdd15d599cb307cf6
      https://github.com/zanata/zanata-client/commit/29cbd7ec6e85e4a42292476fdd15d599cb307cf6
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-12-23 (Tue, 23 Dec 2014)

  Changed paths:
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/AbstractGettextPushStrategy.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/GettextDirStrategy.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/GettextPushStrategy.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java
    M zanata-client-commands/src/test/java/org/zanata/client/commands/push/GettextDirStrategyTest.java

  Log Message:
  -----------
  Merge pull request #40 from zanata/rhbz1174516-podir-filemapping

rhbz1174516 - enable more flexible file mappings rules in podir project


  Commit: 1fbfeacd6d59f1b419d16f5bfe351678fc8e7db7
      https://github.com/zanata/zanata-client/commit/1fbfeacd6d59f1b419d16f5bfe351678fc8e7db7
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-12-23 (Tue, 23 Dec 2014)

  Changed paths:
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/AbstractGettextPushStrategy.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/GettextDirStrategy.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/GettextPushStrategy.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java
    M zanata-client-commands/src/test/java/org/zanata/client/commands/push/GettextDirStrategyTest.java

  Log Message:
  -----------
  Merge branch 'release' into integration/master

Conflicts:
	zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java


Compare: https://github.com/zanata/zanata-client/compare/93fb090782b8...1fbfeacd6d59