Projects >> zanata-server >>eef88fc24e7d45ddd389d018882aad3414330dd1

Chunk
Conflicting content 
   @DefaultMessage("Last run: {0}")
   String lastValidationRun(String completeTime);

<<<<<<< HEAD
   @DefaultMessage("Upload document to merge/override translation")
   String uploadButtonTitle();
   
   @DefaultMessage("Download document with extension {0}")
   String downloadFileTitle(String key);
=======
   @DefaultMessage("Start time: {0}")
   String lastValidationRunTooltip(String startTime);


>>>>>>> 860a63b3a49c203c7ccf9fd87cb8757e79fece99
}
Solution content 
   @DefaultMessage("Last run: {0}")
   String lastValidationRun(String completeTime);

   @DefaultMessage("Upload document to merge/override translation")
   String uploadButtonTitle();
   
   @DefaultMessage("Download document with extension {0}")
   String downloadFileTitle(String key);

}
File
WebTransMessages.java
Developer's decision
Version 1
Kind of conflict
Method interface
Chunk
Conflicting content 
   {
      this.loadingPanel = loadingPanel;

<<<<<<< HEAD
      confirmationBox = new DownloadFilesConfirmationBox(false, resources);
=======
      dataProvider = new ListDataProvider();
      confirmationBox = new DownloadFilesConfirmationBox(false, messages, resources);
>>>>>>> 860a63b3a49c203c7ccf9fd87cb8757e79fece99
      fileUploadDialog = new FileUploadDialog(resources);
      pager = new Pager(messages, resources);
      searchField = new SearchField(this);
Solution content 
   {
      this.loadingPanel = loadingPanel;

      confirmationBox = new DownloadFilesConfirmationBox(false, messages, resources);
      fileUploadDialog = new FileUploadDialog(resources);
      pager = new Pager(messages, resources);
      searchField = new SearchField(this);
File
DocumentListView.java
Developer's decision
Combination
Kind of conflict
Attribute
Method invocation
Chunk
Conflicting content 
               if (result.getLastModifiedBy() != null)

      LocaleId localeId = action.getWorkspaceId().getLocaleId();
      ProjectIterationId iterationId = action.getWorkspaceId().getProjectIterationId();
<<<<<<< HEAD

      List docs = new ArrayList();

      List hDocs = getDocumentList(action);

      for (HDocument hDoc : hDocs)
      {
         DocumentId docId = new DocumentId(hDoc.getId(), hDoc.getDocId());
         TranslationStats stats = documentDAO.getStatistics(hDoc.getId(), localeId);
         HTextFlowTarget result = translationStateCacheImpl.getDocLastModifiedTextFlowTarget(hDoc.getId(), localeId);
=======
      ArrayList docs = new ArrayList();

      Collection hDocs = documentDAO.getAllByProjectIteration(iterationId.getProjectSlug(), iterationId.getIterationSlug());
      for (HDocument hDoc : hDocs)
      {
         if (action.getFilters() == null || action.getFilters().isEmpty() || action.getFilters().contains(hDoc.getPath() + hDoc.getName()))
         {
            DocumentId docId = new DocumentId(hDoc.getId(), hDoc.getDocId());
            TranslationStats stats = documentDAO.getStatistics(hDoc.getId(), localeId);
            HTextFlowTarget result = translationStateCacheImpl.getDocLastModifiedTextFlowTarget(hDoc.getId(), localeId);

            Date lastTranslatedDate = null;
            String lastTranslatedBy = "";

            if(result != null)
            {
               lastTranslatedDate = result.getLastChanged();
               {
                  lastTranslatedBy = result.getLastModifiedBy().getAccount().getUsername();
               }
            }
>>>>>>> 860a63b3a49c203c7ccf9fd87cb8757e79fece99

         Date lastTranslatedDate = null;
         String lastTranslatedBy = "";
Solution content 
      LocaleId localeId = action.getWorkspaceId().getLocaleId();
      ProjectIterationId iterationId = action.getWorkspaceId().getProjectIterationId();

      List docs = new ArrayList();

      List hDocs = getDocumentList(action);

      for (HDocument hDoc : hDocs)
      {
         DocumentId docId = new DocumentId(hDoc.getId(), hDoc.getDocId());
         TranslationStats stats = documentDAO.getStatistics(hDoc.getId(), localeId);
         HTextFlowTarget result = translationStateCacheImpl.getDocLastModifiedTextFlowTarget(hDoc.getId(), localeId);

         Date lastTranslatedDate = null;
         String lastTranslatedBy = "";
File
GetDocumentListHandler.java
Developer's decision
Version 1
Kind of conflict
For statement
If statement
Method invocation
Variable
Chunk
Conflicting content 
         Date lastTranslatedDate = null;
         String lastTranslatedBy = "";

<<<<<<< HEAD
         if (result != null)
         {
            lastTranslatedDate = result.getLastChanged();
            if (result.getLastModifiedBy() != null)
=======
            Map downloadExtensions = new HashMap();

            ProjectType type = hDoc.getProjectIteration().getProjectType();
            if (type == ProjectType.Gettext || type == ProjectType.Podir)
            {
               downloadExtensions.put(".po", "po?docId=" + hDoc.getDocId());
            }
            else
            {
               downloadExtensions.put("offline .po", "offlinepo?docId=" + hDoc.getDocId());
            }

            if (translationFileServiceImpl.hasPersistedDocument(iterationId.getProjectSlug(), iterationId.getIterationSlug(), hDoc.getPath(), hDoc.getName()))
>>>>>>> 860a63b3a49c203c7ccf9fd87cb8757e79fece99
            {
               lastTranslatedBy = result.getLastModifiedBy().getAccount().getUsername();
            }
Solution content 
            else
            {
         Date lastTranslatedDate = null;
         String lastTranslatedBy = "";

         if (result != null)
         {
            lastTranslatedDate = result.getLastChanged();
            if (result.getLastModifiedBy() != null)
            {
               lastTranslatedBy = result.getLastModifiedBy().getAccount().getUsername();
            }
         }

         HPerson person = hDoc.getLastModifiedBy();
         String lastModifiedBy = "";
         if (person != null)
         {
            lastModifiedBy = person.getAccount().getUsername();
         }

         Map downloadExtensions = new HashMap();

            ProjectType type = hDoc.getProjectIteration().getProjectType();
            if (type == ProjectType.Gettext || type == ProjectType.Podir)
            {
               downloadExtensions.put(".po", "po?docId=" + hDoc.getDocId());
            }
               downloadExtensions.put("offline .po", "offlinepo?docId=" + hDoc.getDocId());
            }

            if (translationFileServiceImpl.hasPersistedDocument(iterationId.getProjectSlug(), iterationId.getIterationSlug(), hDoc.getPath(), hDoc.getName()))
            {
               String extension = "." + translationFileServiceImpl.getFileExtension(iterationId.getProjectSlug(), iterationId.getIterationSlug(), hDoc.getPath(), hDoc.getName());
               downloadExtensions.put(extension, "baked?docId=" + hDoc.getDocId());
            }
File
GetDocumentListHandler.java
Developer's decision
Manual
Kind of conflict
If statement
Method invocation
Variable