mirror of
https://github.com/PiBrewing/craftbeerpi4.git
synced 2024-11-09 17:07:43 +01:00
fix translaton controller
This commit is contained in:
parent
d0eceffeaf
commit
705c81a075
2 changed files with 101 additions and 107 deletions
|
@ -3,8 +3,7 @@
|
|||
<component name="ChangeListManager">
|
||||
<list default="true" id="1a245e6a-2e43-4348-8759-dc1b63a4c9c8" name="Default" comment="Lots of changes">
|
||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/cbpi/controller/plugin_controller.py" beforeDir="false" afterPath="$PROJECT_DIR$/cbpi/controller/plugin_controller.py" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/config/plugin_list.txt" beforeDir="false" afterPath="$PROJECT_DIR$/config/plugin_list.txt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/cbpi/controller/translation_controller.py" beforeDir="false" afterPath="$PROJECT_DIR$/cbpi/controller/translation_controller.py" afterDir="false" />
|
||||
</list>
|
||||
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
|
@ -72,20 +71,6 @@
|
|||
</component>
|
||||
<component name="FileEditorManager">
|
||||
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/setup.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="45">
|
||||
<caret line="3" column="20" selection-start-line="3" selection-start-column="20" selection-end-line="3" selection-end-column="20" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/.nojekyll">
|
||||
<provider selected="true" editor-type-id="text-editor" />
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/config/config.yaml">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
|
@ -95,7 +80,7 @@
|
|||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="true">
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/config/plugin_list.txt">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="15">
|
||||
|
@ -104,10 +89,33 @@
|
|||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/cbpi/eventbus.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state>
|
||||
<folding>
|
||||
<element signature="e#0#14#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/cbpi/craftbeerpi.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="197">
|
||||
<caret line="92" column="49" selection-start-line="92" selection-start-column="49" selection-end-line="92" selection-end-column="49" />
|
||||
<folding>
|
||||
<element signature="e#0#14#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/cbpi/controller/plugin_controller.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="43">
|
||||
<state relative-caret-position="945">
|
||||
<caret line="63" column="44" selection-start-line="63" selection-start-column="44" selection-end-line="63" selection-end-column="44" />
|
||||
<folding>
|
||||
<element signature="e#0#14#0" expanded="true" />
|
||||
|
@ -142,7 +150,7 @@
|
|||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/cbpi/controller/system_controller.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="315">
|
||||
<state relative-caret-position="405">
|
||||
<caret line="27" selection-start-line="27" selection-end-line="27" />
|
||||
<folding>
|
||||
<element signature="e#0#15#0" expanded="true" />
|
||||
|
@ -151,11 +159,11 @@
|
|||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<file pinned="false" current-in-tab="true">
|
||||
<entry file="file://$PROJECT_DIR$/cbpi/controller/translation_controller.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="285">
|
||||
<caret line="21" column="18" selection-start-line="21" selection-start-column="18" selection-end-line="21" selection-end-column="18" />
|
||||
<state relative-caret-position="45">
|
||||
<caret line="3" lean-forward="true" selection-start-line="3" selection-end-line="3" />
|
||||
<folding>
|
||||
<element signature="e#0#14#0" expanded="true" />
|
||||
</folding>
|
||||
|
@ -270,7 +278,6 @@
|
|||
<option value="$PROJECT_DIR$/cbpi/extension/ui/react/src/recucers/translation.js" />
|
||||
<option value="$APPLICATION_CONFIG_DIR$/consoles/.datagrid/cell" />
|
||||
<option value="$PROJECT_DIR$/cbpi/database/model.py" />
|
||||
<option value="$PROJECT_DIR$/cbpi/controller/translation_controller.py" />
|
||||
<option value="$PROJECT_DIR$/cbpi/http_endpoints/http_translation.py" />
|
||||
<option value="$PROJECT_DIR$/requirements.txt" />
|
||||
<option value="$PROJECT_DIR$/.gitignore" />
|
||||
|
@ -278,6 +285,7 @@
|
|||
<option value="$PROJECT_DIR$/config/config.yaml" />
|
||||
<option value="$PROJECT_DIR$/config/plugin_list.txt" />
|
||||
<option value="$PROJECT_DIR$/cbpi/controller/plugin_controller.py" />
|
||||
<option value="$PROJECT_DIR$/cbpi/controller/translation_controller.py" />
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
|
@ -305,41 +313,17 @@
|
|||
<item name="craftbeerpi4" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="cbpi" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="craftbeerpi4" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="cbpi" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="controller" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="craftbeerpi4" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="config" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
|
||||
<item name="< Python 3.7.1 virtualenv at ~/cbp42 >" type="70bed36:NamedLibraryElementNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
|
||||
<item name="< Python 3.7.1 virtualenv at ~/cbp42 >" type="70bed36:NamedLibraryElementNode" />
|
||||
<item name="site-packages" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
|
||||
<item name="< Python 3.7.1 virtualenv at ~/cbp42 >" type="70bed36:NamedLibraryElementNode" />
|
||||
<item name="site-packages" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="cbpi-ui" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
|
||||
<item name="< Python 3.7.1 virtualenv at ~/cbp42 >" type="70bed36:NamedLibraryElementNode" />
|
||||
<item name="site-packages" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="cbpi-ui" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="static" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
</expand>
|
||||
<select />
|
||||
</subPane>
|
||||
|
@ -567,11 +551,11 @@
|
|||
<method v="2" />
|
||||
</configuration>
|
||||
<list>
|
||||
<item itemvalue="Python.cli" />
|
||||
<item itemvalue="Python.run" />
|
||||
<item itemvalue="Python.sample" />
|
||||
<item itemvalue="Python.test" />
|
||||
<item itemvalue="Python.test_app" />
|
||||
<item itemvalue="Python.run" />
|
||||
<item itemvalue="Python.test" />
|
||||
<item itemvalue="Python.cli" />
|
||||
<item itemvalue="Python.sample" />
|
||||
<item itemvalue="Python tests.pytest for tests.test_actor" />
|
||||
<item itemvalue="Python tests.pytest in tests" />
|
||||
</list>
|
||||
|
@ -606,6 +590,8 @@
|
|||
<workItem from="1546520120024" duration="55264000" />
|
||||
<workItem from="1546797494638" duration="14249000" />
|
||||
<workItem from="1546971487719" duration="1233000" />
|
||||
<workItem from="1546973098962" duration="96000" />
|
||||
<workItem from="1546975321797" duration="27000" />
|
||||
</task>
|
||||
<task id="LOCAL-00001" summary="Lots of changes">
|
||||
<created>1541288846149</created>
|
||||
|
@ -657,7 +643,7 @@
|
|||
</history-entry>
|
||||
</component>
|
||||
<component name="TimeTrackingManager">
|
||||
<option name="totallyTimeSpent" value="175025000" />
|
||||
<option name="totallyTimeSpent" value="175148000" />
|
||||
</component>
|
||||
<component name="TodoView" selected-index="4">
|
||||
<todo-panel id="selected-file">
|
||||
|
@ -669,10 +655,10 @@
|
|||
</todo-panel>
|
||||
</component>
|
||||
<component name="ToolWindowManager">
|
||||
<frame x="0" y="23" width="1680" height="962" extended-state="6" />
|
||||
<frame x="0" y="23" width="1680" height="962" extended-state="0" />
|
||||
<editor active="true" />
|
||||
<layout>
|
||||
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.2948718" />
|
||||
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.3021978" />
|
||||
<window_info id="Structure" order="1" weight="0.24957556" />
|
||||
<window_info id="Favorites" order="2" side_tool="true" />
|
||||
<window_info anchor="bottom" id="Event Log" order="0" sideWeight="0.2737931" side_tool="true" weight="0.3997555" />
|
||||
|
@ -680,7 +666,7 @@
|
|||
<window_info anchor="bottom" id="Run" order="2" sideWeight="0.7262069" weight="0.47586206" />
|
||||
<window_info anchor="bottom" id="Debug" order="3" weight="0.39731053" />
|
||||
<window_info anchor="bottom" id="Python Console" order="4" weight="0.32885087" />
|
||||
<window_info anchor="bottom" id="Terminal" order="5" sideWeight="0.49761903" weight="0.30804598" />
|
||||
<window_info anchor="bottom" id="Terminal" order="5" sideWeight="0.49761903" visible="true" weight="0.5609195" />
|
||||
<window_info anchor="bottom" id="TODO" order="6" weight="0.3286945" />
|
||||
<window_info anchor="bottom" id="Message" order="7" />
|
||||
<window_info anchor="bottom" id="Find" order="8" weight="0.32518336" />
|
||||
|
@ -849,16 +835,6 @@
|
|||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/cbpi/craftbeerpi.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="228">
|
||||
<caret line="92" column="49" selection-start-line="92" selection-start-column="49" selection-end-line="92" selection-end-column="49" />
|
||||
<folding>
|
||||
<element signature="e#0#14#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/cbpi/database/orm_framework.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="-1221">
|
||||
|
@ -906,6 +882,29 @@
|
|||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/.nojekyll">
|
||||
<provider selected="true" editor-type-id="text-editor" />
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/config/config.yaml">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="120">
|
||||
<caret line="8" column="12" selection-start-line="8" selection-start-column="12" selection-end-line="8" selection-end-column="12" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/cbpi/controller/plugin_controller.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="945">
|
||||
<caret line="63" column="44" selection-start-line="63" selection-start-column="44" selection-end-line="63" selection-end-column="44" />
|
||||
<folding>
|
||||
<element signature="e#0#14#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$USER_HOME$/cbp42/lib/python3.7/site-packages/cbpi-ui/__init__.py">
|
||||
<provider selected="true" editor-type-id="text-editor" />
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/requirements.txt">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="150">
|
||||
|
@ -922,7 +921,7 @@
|
|||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/cbpi/controller/system_controller.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="315">
|
||||
<state relative-caret-position="405">
|
||||
<caret line="27" selection-start-line="27" selection-end-line="27" />
|
||||
<folding>
|
||||
<element signature="e#0#15#0" expanded="true" />
|
||||
|
@ -930,39 +929,6 @@
|
|||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/cbpi/controller/translation_controller.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="285">
|
||||
<caret line="21" column="18" selection-start-line="21" selection-start-column="18" selection-end-line="21" selection-end-column="18" />
|
||||
<folding>
|
||||
<element signature="e#0#14#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/.nojekyll">
|
||||
<provider selected="true" editor-type-id="text-editor" />
|
||||
</entry>
|
||||
<entry file="file://$USER_HOME$/cbp42/lib/python3.7/site-packages/cbpi-ui/__init__.py">
|
||||
<provider selected="true" editor-type-id="text-editor" />
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/cbpi/controller/plugin_controller.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="43">
|
||||
<caret line="63" column="44" selection-start-line="63" selection-start-column="44" selection-end-line="63" selection-end-column="44" />
|
||||
<folding>
|
||||
<element signature="e#0#14#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/config/config.yaml">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="120">
|
||||
<caret line="8" column="12" selection-start-line="8" selection-start-column="12" selection-end-line="8" selection-end-column="12" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/config/plugin_list.txt">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="15">
|
||||
|
@ -970,5 +936,34 @@
|
|||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/cbpi/eventbus.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state>
|
||||
<folding>
|
||||
<element signature="e#0#14#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/cbpi/craftbeerpi.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="197">
|
||||
<caret line="92" column="49" selection-start-line="92" selection-start-column="49" selection-end-line="92" selection-end-column="49" />
|
||||
<folding>
|
||||
<element signature="e#0#14#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/cbpi/controller/translation_controller.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="45">
|
||||
<caret line="3" lean-forward="true" selection-start-line="3" selection-end-line="3" />
|
||||
<folding>
|
||||
<element signature="e#0#14#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</component>
|
||||
</project>
|
|
@ -1,7 +1,6 @@
|
|||
import logging
|
||||
|
||||
from database.model import TranslationModel
|
||||
|
||||
from cbpi.database.model import TranslationModel
|
||||
|
||||
class TranslationController(object):
|
||||
|
||||
|
|
Loading…
Reference in a new issue