developers
/
Orbit
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '0913_ntu_ga_primary' of https://github.com/Rulingcom/orbit into 0913_ntu_ga_primary

This commit is contained in:
Bernie Chiu 2013-10-11 11:32:01 +08:00
parent 9ed824d615 6b85824a90
commit 6230bc3d36
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vendor/built_in_modules/survey_b/app/views/panel/survey_b/back_end/survey_b/index.html.erb vendored
View File

@ -16,7 +16,7 @@
</table> </table>
<div class="form-actions form-fixed pagination-right"> <div class="form-actions form-fixed pagination-right">
<%= link_to t(:back) + t('survey_b.survey_b'), result_panel_survey_b_back_end_survey_b_index_path, :class => 'btn btn-primary pull-right' %> <%= link_to t(:back) + t('survey_b.survey_b'), panel_survey_b_back_end_periods_path, :class => 'btn btn-primary pull-right' %>
<div id="survey_answers_pagination" class="paginationFixed"> <div id="survey_answers_pagination" class="paginationFixed">
<%= paginate @answers %> <%= paginate @answers %>
</div> </div>

2
vendor/built_in_modules/survey_b/config/locales/en.yml vendored
View File

@ -31,7 +31,7 @@ en:
institutions: institutions:
institution1: 文書組 institution1: 文書組
institution2: 事物組 institution2: 事務組
institution3: 保管組 institution3: 保管組
institution4: 營繕組 institution4: 營繕組
institution5: 出納組 institution5: 出納組

2
vendor/built_in_modules/survey_b/config/locales/zh_tw.yml vendored
View File

@ -31,7 +31,7 @@ zh_tw:
institutions: institutions:
institution1: 文書組 institution1: 文書組
institution2: 事物組 institution2: 事務組
institution3: 保管組 institution3: 保管組
institution4: 營繕組 institution4: 營繕組
institution5: 出納組 institution5: 出納組